Show More
@@ -717,8 +717,6 b' class Test(unittest.TestCase):' | |||||
717 | # test we "ran", but we want to exclude skipped tests |
|
717 | # test we "ran", but we want to exclude skipped tests | |
718 | # from those we count towards those run. |
|
718 | # from those we count towards those run. | |
719 | result.testsRun -= 1 |
|
719 | result.testsRun -= 1 | |
720 | except WarnTest as e: |
|
|||
721 | result.addWarn(self, str(e)) |
|
|||
722 | except ReportedTest as e: |
|
720 | except ReportedTest as e: | |
723 | pass |
|
721 | pass | |
724 | except self.failureException as e: |
|
722 | except self.failureException as e: | |
@@ -788,7 +786,7 b' class Test(unittest.TestCase):' | |||||
788 | elif ret == 'timeout': |
|
786 | elif ret == 'timeout': | |
789 | self.fail('timed out') |
|
787 | self.fail('timed out') | |
790 | elif ret is False: |
|
788 | elif ret is False: | |
791 |
|
|
789 | self.fail('no result code from test') | |
792 | elif out != self._refout: |
|
790 | elif out != self._refout: | |
793 | # Diff generation may rely on written .err file. |
|
791 | # Diff generation may rely on written .err file. | |
794 | if (ret != 0 or out != self._refout) and not self._skipped \ |
|
792 | if (ret != 0 or out != self._refout) and not self._skipped \ | |
@@ -1481,9 +1479,6 b' class TTest(Test):' | |||||
1481 |
|
1479 | |||
1482 | iolock = threading.RLock() |
|
1480 | iolock = threading.RLock() | |
1483 |
|
1481 | |||
1484 | class WarnTest(Exception): |
|
|||
1485 | """Raised to indicate that a test warned.""" |
|
|||
1486 |
|
||||
1487 | class ReportedTest(Exception): |
|
1482 | class ReportedTest(Exception): | |
1488 | """Raised to indicate that a test already reported.""" |
|
1483 | """Raised to indicate that a test already reported.""" | |
1489 |
|
1484 |
General Comments 0
You need to be logged in to leave comments.
Login now