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