Show More
@@ -1762,10 +1762,6 b' class TestResult(unittest._TextTestResul' | |||
|
1762 | 1762 | else: |
|
1763 | 1763 | servefail, lines = getdiff(expected, got, |
|
1764 | 1764 | test.refpath, test.errpath) |
|
1765 | if servefail: | |
|
1766 | self.stream.write( | |
|
1767 | 'server failed to start (HGPORT=%s)' % test._startport) | |
|
1768 | ||
|
1769 | 1765 | self.stream.write('\n') |
|
1770 | 1766 | for line in lines: |
|
1771 | 1767 | line = highlightdiff(line, self.color) |
@@ -1777,6 +1773,10 b' class TestResult(unittest._TextTestResul' | |||
|
1777 | 1773 | self.stream.write(line) |
|
1778 | 1774 | self.stream.flush() |
|
1779 | 1775 | |
|
1776 | if servefail: | |
|
1777 | raise test.failureException( | |
|
1778 | 'server failed to start (HGPORT=%s)' % test._startport) | |
|
1779 | ||
|
1780 | 1780 | # handle interactive prompt without releasing iolock |
|
1781 | 1781 | if self._options.interactive: |
|
1782 | 1782 | if test.readrefout() != expected: |
@@ -541,7 +541,7 b' Verify that when a process fails to star' | |||
|
541 | 541 | > $ echo 'abort: child process failed to start blah' |
|
542 | 542 | > EOF |
|
543 | 543 | $ rt test-serve-fail.t |
|
544 | server failed to start (HGPORT=*) (glob) | |
|
544 | ||
|
545 | 545 | --- $TESTTMP/test-serve-fail.t |
|
546 | 546 | +++ $TESTTMP/test-serve-fail.t.err |
|
547 | 547 | @@ -1* +1,2 @@ (glob) |
@@ -550,7 +550,7 b' Verify that when a process fails to star' | |||
|
550 | 550 | |
|
551 | 551 | ERROR: test-serve-fail.t output changed |
|
552 | 552 | ! |
|
553 |
Failed test-serve-fail.t: |
|
|
553 | Failed test-serve-fail.t: server failed to start (HGPORT=*) (glob) | |
|
554 | 554 | # Ran 1 tests, 0 skipped, 1 failed. |
|
555 | 555 | python hash seed: * (glob) |
|
556 | 556 | [1] |
General Comments 0
You need to be logged in to leave comments.
Login now