# HG changeset patch # User Matt Mackall # Date 1449262510 21600 # Node ID a40b623e63807c2e71452795e5ca529c6c66f744 # Parent 4eeef1b2d689bad18f473b5e118cca061f6ca560 run-tests: report timeouts in a less alarming fashion Rather than report timed-out tests like this: ERROR: test-convert-svn-sink.t output changed ! ..simply put a 't' rather than a '.' in the stream. diff -r 4eeef1b2d689 -r a40b623e6380 tests/run-tests.py --- a/tests/run-tests.py Wed Dec 16 17:40:01 2015 -0600 +++ b/tests/run-tests.py Fri Dec 04 14:55:10 2015 -0600 @@ -1273,10 +1273,13 @@ self.stop() else: with iolock: - if not self._options.nodiff: - self.stream.write('\nERROR: %s output changed\n' % test) + if reason == "timed out": + self.stream.write('t') + else: + if not self._options.nodiff: + self.stream.write('\nERROR: %s output changed\n' % test) + self.stream.write('!') - self.stream.write('!') self.stream.flush() def addSuccess(self, test): diff -r 4eeef1b2d689 -r a40b623e6380 tests/test-run-tests.t --- a/tests/test-run-tests.t Wed Dec 16 17:40:01 2015 -0600 +++ b/tests/test-run-tests.t Fri Dec 04 14:55:10 2015 -0600 @@ -412,9 +412,7 @@ > cat test-timeout.t >> test-slow-timeout.t $ run-tests.py --with-hg=`which hg` --timeout=1 --slowtimeout=3 \ > test-timeout.t test-slow-timeout.t - s - ERROR: test-timeout.t output changed - ! + st Skipped test-slow-timeout.t: skipped Failed test-timeout.t: timed out # Ran 1 tests, 1 skipped, 0 warned, 1 failed. @@ -422,9 +420,7 @@ [1] $ run-tests.py --with-hg=`which hg` --timeout=1 --slowtimeout=3 \ > test-timeout.t test-slow-timeout.t --allow-slow-tests - . - ERROR: test-timeout.t output changed - ! + .t Failed test-timeout.t: timed out # Ran 2 tests, 0 skipped, 0 warned, 1 failed. python hash seed: * (glob)