Show More
@@ -717,8 +717,6 class Test(unittest.TestCase): | |||
|
717 | 717 | # test we "ran", but we want to exclude skipped tests |
|
718 | 718 | # from those we count towards those run. |
|
719 | 719 | result.testsRun -= 1 |
|
720 | except ReportedTest as e: | |
|
721 | pass | |
|
722 | 720 | except self.failureException as e: |
|
723 | 721 | # This differs from unittest in that we don't capture |
|
724 | 722 | # the stack trace. This is for historical reasons and |
@@ -1479,9 +1477,6 class TTest(Test): | |||
|
1479 | 1477 | |
|
1480 | 1478 | iolock = threading.RLock() |
|
1481 | 1479 | |
|
1482 | class ReportedTest(Exception): | |
|
1483 | """Raised to indicate that a test already reported.""" | |
|
1484 | ||
|
1485 | 1480 | class TestResult(unittest._TextTestResult): |
|
1486 | 1481 | """Holds results when executing via unittest.""" |
|
1487 | 1482 | # Don't worry too much about accessing the non-public _TextTestResult. |
@@ -1578,10 +1573,8 class TestResult(unittest._TextTestResul | |||
|
1578 | 1573 | servefail, lines = getdiff(expected, got, |
|
1579 | 1574 | test.refpath, test.errpath) |
|
1580 | 1575 | if servefail: |
|
1581 |
|
|
|
1582 | test, | |
|
1576 | raise test.failureException( | |
|
1583 | 1577 | 'server failed to start (HGPORT=%s)' % test._startport) |
|
1584 | raise ReportedTest('server failed to start') | |
|
1585 | 1578 | else: |
|
1586 | 1579 | self.stream.write('\n') |
|
1587 | 1580 | for line in lines: |
General Comments 0
You need to be logged in to leave comments.
Login now