Show More
@@ -1273,10 +1273,13 b' class TestResult(unittest._TextTestResul' | |||
|
1273 | 1273 | self.stop() |
|
1274 | 1274 | else: |
|
1275 | 1275 | with iolock: |
|
1276 | if not self._options.nodiff: | |
|
1277 |
self.stream.write(' |
|
|
1276 | if reason == "timed out": | |
|
1277 | self.stream.write('t') | |
|
1278 | else: | |
|
1279 | if not self._options.nodiff: | |
|
1280 | self.stream.write('\nERROR: %s output changed\n' % test) | |
|
1281 | self.stream.write('!') | |
|
1278 | 1282 | |
|
1279 | self.stream.write('!') | |
|
1280 | 1283 | self.stream.flush() |
|
1281 | 1284 | |
|
1282 | 1285 | def addSuccess(self, test): |
@@ -412,9 +412,7 b' timeouts' | |||
|
412 | 412 | > cat test-timeout.t >> test-slow-timeout.t |
|
413 | 413 | $ run-tests.py --with-hg=`which hg` --timeout=1 --slowtimeout=3 \ |
|
414 | 414 | > test-timeout.t test-slow-timeout.t |
|
415 | s | |
|
416 | ERROR: test-timeout.t output changed | |
|
417 | ! | |
|
415 | st | |
|
418 | 416 | Skipped test-slow-timeout.t: skipped |
|
419 | 417 | Failed test-timeout.t: timed out |
|
420 | 418 | # Ran 1 tests, 1 skipped, 0 warned, 1 failed. |
@@ -422,9 +420,7 b' timeouts' | |||
|
422 | 420 | [1] |
|
423 | 421 | $ run-tests.py --with-hg=`which hg` --timeout=1 --slowtimeout=3 \ |
|
424 | 422 | > test-timeout.t test-slow-timeout.t --allow-slow-tests |
|
425 | . | |
|
426 | ERROR: test-timeout.t output changed | |
|
427 | ! | |
|
423 | .t | |
|
428 | 424 | Failed test-timeout.t: timed out |
|
429 | 425 | # Ran 2 tests, 0 skipped, 0 warned, 1 failed. |
|
430 | 426 | python hash seed: * (glob) |
General Comments 0
You need to be logged in to leave comments.
Login now