Updating tests to reflect change in default categories

PyUtilib · Dec 17, 2018 · 72ff932 · 72ff932
1 parent 81566c7
commit 72ff932
Showing 1 changed file with 9 additions and 6 deletions.
diff --git a/pyutilib/dev/tests/test_runtests.py b/pyutilib/dev/tests/test_runtests.py
@@ -13,13 +13,16 @@ def _run(self, args):
             del os.environ['PYUTILIB_UNITTEST_CATEGORY']
         stream_out = six.StringIO()
         pyutilib.misc.setup_redirect(stream_out)
-        runPyUtilibTests(['nosetests', '-v', '--no-xunit'] + args + 
-                         ['pyutilib.th.tests.test_pyunit'],
-                         use_exec=False)
+        rc = runPyUtilibTests(['nosetests', '-v', '--no-xunit'] + args +
+                              ['pyutilib.th.tests.test_pyunit'],
+                              use_exec=False)
         pyutilib.misc.reset_redirect()
         if oldCat is not None:
             os.environ['PYUTILIB_UNITTEST_CATEGORY'] = oldCat
 
+        if rc:
+            self.fail("running nosetests failed (rc=%s)" % (rc,))
+
         result = []
         for line in stream_out.getvalue().splitlines():
             if '...' not in line:
@@ -136,7 +139,7 @@ def test_expensive(self):
             #'pyutilib.th.tests.test_pyunit.TestNoCategory.test_fragile',
             #'pyutilib.th.tests.test_pyunit.TestNoCategory.test_fragile_smoke',
             #'pyutilib.th.tests.test_pyunit.TestNoCategory.test_multi',
-            'pyutilib.th.tests.test_pyunit.TestNoCategory.test_noCategory',
+            #'pyutilib.th.tests.test_pyunit.TestNoCategory.test_noCategory',
             #'pyutilib.th.tests.test_pyunit.TestNoCategory.test_notExpensive',
             #'pyutilib.th.tests.test_pyunit.TestNoCategory.test_smoke',
         ]
@@ -158,7 +161,7 @@ def test_expensive_AND_smoke(self):
             #'pyutilib.th.tests.test_pyunit.TestNoCategory.test_fragile',
             #'pyutilib.th.tests.test_pyunit.TestNoCategory.test_fragile_smoke',
             #'pyutilib.th.tests.test_pyunit.TestNoCategory.test_multi',
-            'pyutilib.th.tests.test_pyunit.TestNoCategory.test_noCategory',
+            #'pyutilib.th.tests.test_pyunit.TestNoCategory.test_noCategory',
             #'pyutilib.th.tests.test_pyunit.TestNoCategory.test_notExpensive',
             #'pyutilib.th.tests.test_pyunit.TestNoCategory.test_smoke',
         ]
@@ -202,7 +205,7 @@ def test_NOT_expensive(self):
             #'pyutilib.th.tests.test_pyunit.TestNoCategory.test_fragile',
             #'pyutilib.th.tests.test_pyunit.TestNoCategory.test_fragile_smoke',
             'pyutilib.th.tests.test_pyunit.TestNoCategory.test_multi',
-            #'pyutilib.th.tests.test_pyunit.TestNoCategory.test_noCategory',
+            'pyutilib.th.tests.test_pyunit.TestNoCategory.test_noCategory',
             'pyutilib.th.tests.test_pyunit.TestNoCategory.test_notExpensive',
             'pyutilib.th.tests.test_pyunit.TestNoCategory.test_smoke',
         ]