Merge remote-tracking branch 'upstream/master' into fix-report-outcom…

…e-for-xpass
matthiasha · Aug 18, 2016 · 68ebf55 · 68ebf55
2 parents 0fb34cd + a01cbce
commit 68ebf55
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/tox.ini b/tox.ini
@@ -78,13 +78,12 @@ commands=
 [testenv:py27-trial]
 deps=twisted
 commands=
-  py.test -rsxf {posargs:testing/test_unittest.py}
+  py.test -ra {posargs:testing/test_unittest.py}
 
 [testenv:py35-trial]
-platform=linux|darwin
 deps={[testenv:py27-trial]deps}
 commands=
-  py.test -rsxf {posargs:testing/test_unittest.py}
+  py.test -ra {posargs:testing/test_unittest.py}
 
 [testenv:doctest]
 commands=py.test --doctest-modules _pytest