Repository navigation
Commit 6e1be71
committed
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -572,7 +572,7 @@ def _get_module_from_name(name): | |||
| 572 | 572 | result = unittest.TestResult() | |
| 573 | 573 | suite.run(result) | |
| 574 | 574 | self.assertEqual(len(result.skipped), 1) | |
| 575 | - self.assertEqual(result.testsRun, 1) | ||
| 575 | + self.assertEqual(result.testsRun, 0) | ||
| 576 | 576 | self.assertEqual(import_calls, ['my_package']) | |
| 577 | 577 | ||
| 578 | 578 | # Check picklability | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -103,16 +103,16 @@ def test_dont_skip(self): pass | |||
| 103 | 103 | result = LoggingResult(events) | |
| 104 | 104 | self.assertIs(suite.run(result), result) | |
| 105 | 105 | self.assertEqual(len(result.skipped), 1) | |
| 106 | - expected = ['startTest', 'addSkip', 'stopTest', | ||
| 107 | - 'startTest', 'addSuccess', 'stopTest'] | ||
| 106 | + expected = ['addSkip', 'stopTest', 'startTest', | ||
| 107 | + 'addSuccess', 'stopTest'] | ||
| 108 | 108 | self.assertEqual(events, expected) | |
| 109 | - self.assertEqual(result.testsRun, 2) | ||
| 109 | + self.assertEqual(result.testsRun, 1) | ||
| 110 | 110 | self.assertEqual(result.skipped, [(test_do_skip, "testing")]) | |
| 111 | 111 | self.assertTrue(result.wasSuccessful()) | |
| 112 | 112 | ||
| 113 | 113 | events = [] | |
| 114 | 114 | result = test_do_skip.run() | |
| 115 | - self.assertEqual(events, ['startTestRun', 'startTest', 'addSkip', | ||
| 115 | + self.assertEqual(events, ['startTestRun', 'addSkip', | ||
| 116 | 116 | 'stopTest', 'stopTestRun']) | |
| 117 | 117 | self.assertEqual(result.skipped, [(test_do_skip, "testing")]) | |
| 118 | 118 | ||
@@ -135,13 +135,13 @@ def test_1(self): | |||
| 135 | 135 | test = Foo("test_1") | |
| 136 | 136 | suite = unittest.TestSuite([test]) | |
| 137 | 137 | self.assertIs(suite.run(result), result) | |
| 138 | - self.assertEqual(events, ['startTest', 'addSkip', 'stopTest']) | ||
| 138 | + self.assertEqual(events, ['addSkip', 'stopTest']) | ||
| 139 | 139 | self.assertEqual(result.skipped, [(test, "testing")]) | |
| 140 | 140 | self.assertEqual(record, []) | |
| 141 | 141 | ||
| 142 | 142 | events = [] | |
| 143 | 143 | result = test.run() | |
| 144 | - self.assertEqual(events, ['startTestRun', 'startTest', 'addSkip', | ||
| 144 | + self.assertEqual(events, ['startTestRun', 'addSkip', | ||
| 145 | 145 | 'stopTest', 'stopTestRun']) | |
| 146 | 146 | self.assertEqual(result.skipped, [(test, "testing")]) | |
| 147 | 147 | self.assertEqual(record, []) | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -606,7 +606,6 @@ def run(self, result=None): | |||
| 606 | 606 | else: | |
| 607 | 607 | stopTestRun = None | |
| 608 | 608 | ||
| 609 | - result.startTest(self) | ||
| 610 | 609 | try: | |
| 611 | 610 | testMethod = getattr(self, self._testMethodName) | |
| 612 | 611 | if (getattr(self.__class__, "__unittest_skip__", False) or | |
@@ -617,6 +616,9 @@ def run(self, result=None): | |||
| 617 | 616 | _addSkip(result, self, skip_why) | |
| 618 | 617 | return result | |
| 619 | 618 | ||
| 619 | + # Increase the number of running tests only if it hasn't been skipped | ||
| 620 | + result.startTest(self) | ||
| 621 | + | ||
| 620 | 622 | expecting_failure = ( | |
| 621 | 623 | getattr(self, "__unittest_expecting_failure__", False) or | |
| 622 | 624 | getattr(testMethod, "__unittest_expecting_failure__", False) | |
0 commit comments