##// END OF EJS Templates
tests: removed ReportedTest exception...
Gregory Szorc -
r32943:750c3b1b default
parent child Browse files
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 ReportedTest as e:
721 pass
722 except self.failureException as e:
720 except self.failureException as e:
723 # This differs from unittest in that we don't capture
721 # This differs from unittest in that we don't capture
724 # the stack trace. This is for historical reasons and
722 # the stack trace. This is for historical reasons and
@@ -1479,9 +1477,6 b' class TTest(Test):'
1479
1477
1480 iolock = threading.RLock()
1478 iolock = threading.RLock()
1481
1479
1482 class ReportedTest(Exception):
1483 """Raised to indicate that a test already reported."""
1484
1485 class TestResult(unittest._TextTestResult):
1480 class TestResult(unittest._TextTestResult):
1486 """Holds results when executing via unittest."""
1481 """Holds results when executing via unittest."""
1487 # Don't worry too much about accessing the non-public _TextTestResult.
1482 # Don't worry too much about accessing the non-public _TextTestResult.
@@ -1578,10 +1573,8 b' class TestResult(unittest._TextTestResul'
1578 servefail, lines = getdiff(expected, got,
1573 servefail, lines = getdiff(expected, got,
1579 test.refpath, test.errpath)
1574 test.refpath, test.errpath)
1580 if servefail:
1575 if servefail:
1581 self.addFailure(
1576 raise test.failureException(
1582 test,
1583 'server failed to start (HGPORT=%s)' % test._startport)
1577 'server failed to start (HGPORT=%s)' % test._startport)
1584 raise ReportedTest('server failed to start')
1585 else:
1578 else:
1586 self.stream.write('\n')
1579 self.stream.write('\n')
1587 for line in lines:
1580 for line in lines:
General Comments 0
You need to be logged in to leave comments. Login now