# HG changeset patch # User Denis Laxalde # Date 1475571874 -7200 # Node ID 4e3ae4bd3fd55c2a2feed12b198f6a092402ed74 # Parent 15715274a6316c3756819dd830e77e57cbd496f9# Parent 122eacf5210b823d56ae3933a378918d982cffdf Merge public heads diff -r 15715274a631 -r 4e3ae4bd3fd5 tox.ini --- a/tox.ini Mon Sep 26 10:42:19 2016 +0200 +++ b/tox.ini Tue Oct 04 11:04:34 2016 +0200 @@ -26,8 +26,6 @@ flake8 >= 3 commands = flake8 {toxinidir} -# So that Jenkins JUnit plugin does not complain about missing XML results. - touch test-results.xml [testenv:doc] changedir = doc @@ -44,9 +42,7 @@ check-manifest {toxinidir} \ # ignore symlinks that are not recognized by check-manifest, see # https://github.com/mgedmin/check-manifest/issues/69 - --ignore cubicweb/devtools/test/data/cubes/i18ntestcube,cubicweb/test/data/legacy_cubes* -# So that Jenkins JUnit plugin does not complain about missing XML results. - touch test-results.xml + --ignore cubicweb/devtools/test/data/cubes/i18ntestcube*,cubicweb/test/data/legacy_cubes* [pytest] python_files = *test_*.py