diff options
-rw-r--r-- | test/unittest_testlib.py | 2 | ||||
-rw-r--r-- | testlib.py | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/test/unittest_testlib.py b/test/unittest_testlib.py index 28b45f1..f68404b 100644 --- a/test/unittest_testlib.py +++ b/test/unittest_testlib.py @@ -386,7 +386,7 @@ class GenerativeTestsTC(TestCase): yield InnerTest("check_%s"%i, self.check, i) result = self.runner.run(FooTC('test_generative')) - self.assertEqual(result.testsRun, 6) + self.assertEqual(result.testsRun, 10) self.assertEqual(len(result.failures), 0) self.assertEqual(len(result.errors), 0) self.assertEqual(len(result.skipped), 1) @@ -586,6 +586,9 @@ succeeded test into", osp.join(os.getcwd(), FILE_RESTART) except InnerTestSkipped, e: result.addSkip(self, e) return 1 + except SkipTest, e: + result.addSkip(self, e) + return 0 except: result.addError(self, self.__exc_info()) return 2 |