Merge public heads
authorDenis Laxalde <denis.laxalde@logilab.fr>
Tue, 04 Oct 2016 11:04:34 +0200
changeset 11691 4e3ae4bd3fd5
parent 11690 15715274a631 (current diff)
parent 11684 122eacf5210b (diff)
child 11692 d46e0b3a13cc
Merge public heads
--- 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