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