Mercurial > public > mercurial-scm > hg
diff tests/test-run-tests.t @ 23728:31d3f973d079
run-tests: automatically add (glob) to "saved backup bundle to" lines
Avoid spending too much time adding (glob) after running run-tests -i. This
doesn't handle all cases but it helps.
The run-tests tests add a bit of escaping of trailing (glob) in the output to
avoid interference from the outer test runner.
The regexp for matching the output lines contains a group for making multiline
substitute in a way that works with Python before 2.7.
| author | Mads Kiilerich <madski@unity3d.com> |
|---|---|
| date | Thu, 27 Nov 2014 02:04:30 +0100 |
| parents | e8b09f920fe6 |
| children | d64dd1252386 |
line wrap: on
line diff
--- a/tests/test-run-tests.t Mon Jan 05 15:00:02 2015 -0800 +++ b/tests/test-run-tests.t Thu Nov 27 02:04:30 2014 +0100 @@ -297,24 +297,43 @@ Accept the fix - $ echo 'y' | $TESTDIR/run-tests.py --with-hg=`which hg` -i + $ echo " $ echo 'saved backup bundle to \$TESTTMP/foo.hg'" >> test-failure.t + $ echo " saved backup bundle to \$TESTTMP/foo.hg" >> test-failure.t + $ echo " $ echo 'saved backup bundle to \$TESTTMP/foo.hg'" >> test-failure.t + $ echo " saved backup bundle to \$TESTTMP/foo.hg (glob)" >> test-failure.t + $ echo " $ echo 'saved backup bundle to \$TESTTMP/foo.hg'" >> test-failure.t + $ echo " saved backup bundle to \$TESTTMP/*.hg (glob)" >> test-failure.t + $ echo 'y' | $TESTDIR/run-tests.py --with-hg=`which hg` -i 2>&1 | \ + > sed -e 's,(glob)$,&<,g' --- $TESTTMP/test-failure.t +++ $TESTTMP/test-failure.t.err - @@ -1,4 +1,4 @@ + @@ -1,9 +1,9 @@ $ echo babar - rataxes + babar This is a noop statement so that this test is still more bytes than success. + $ echo 'saved backup bundle to $TESTTMP/foo.hg' + - saved backup bundle to $TESTTMP/foo.hg + + saved backup bundle to $TESTTMP/foo.hg (glob)< + $ echo 'saved backup bundle to $TESTTMP/foo.hg' + saved backup bundle to $TESTTMP/foo.hg (glob)< + $ echo 'saved backup bundle to $TESTTMP/foo.hg' Accept this change? [n] .. # Ran 2 tests, 0 skipped, 0 warned, 0 failed. - $ cat test-failure.t + $ sed -e 's,(glob)$,&<,g' test-failure.t $ echo babar babar This is a noop statement so that this test is still more bytes than success. + $ echo 'saved backup bundle to $TESTTMP/foo.hg' + saved backup bundle to $TESTTMP/foo.hg (glob)< + $ echo 'saved backup bundle to $TESTTMP/foo.hg' + saved backup bundle to $TESTTMP/foo.hg (glob)< + $ echo 'saved backup bundle to $TESTTMP/foo.hg' + saved backup bundle to $TESTTMP/*.hg (glob)< (reinstall) $ mv backup test-failure.t