Comments
Patch
@@ -1784,19 +1784,19 @@
servefail, lines = getdiff(expected, got,
test.refpath, test.errpath)
if servefail:
- raise test.failureException(
+ self.stream.write(
'server failed to start (HGPORT=%s)' % test._startport)
- else:
- self.stream.write('\n')
- for line in lines:
- line = highlightdiff(line, self.color)
- if PYTHON3:
- self.stream.flush()
- self.stream.buffer.write(line)
- self.stream.buffer.flush()
- else:
- self.stream.write(line)
- self.stream.flush()
+
+ self.stream.write('\n')
+ for line in lines:
+ line = highlightdiff(line, self.color)
+ if PYTHON3:
+ self.stream.flush()
+ self.stream.buffer.write(line)
+ self.stream.buffer.flush()
+ else:
+ self.stream.write(line)
+ self.stream.flush()
# handle interactive prompt without releasing iolock
if self._options.interactive:
@@ -541,10 +541,16 @@
> $ echo 'abort: child process failed to start blah'
> EOF
$ rt test-serve-fail.t
+ server failed to start (HGPORT=*) (glob)
+ --- $TESTTMP/test-serve-fail.t
+ +++ $TESTTMP/test-serve-fail.t.err
+ @@ -1 +1,2 @@
+ $ echo 'abort: child process failed to start blah'
+ + abort: child process failed to start blah
ERROR: test-serve-fail.t output changed
!
- Failed test-serve-fail.t: server failed to start (HGPORT=*) (glob)
+ Failed test-serve-fail.t: output changed
# Ran 1 tests, 0 skipped, 1 failed.
python hash seed: * (glob)
[1]