changeset 23107:5459b30aa498 stable

tests: silence output race in test-run-tests.t
author Matt Mackall <mpm@selenic.com>
date Thu, 30 Oct 2014 17:52:01 -0500
parents 5f202d50a7e5
children 12837ba22784 2b7c8decca51
files tests/test-run-tests.t
diffstat 1 files changed, 2 insertions(+), 24 deletions(-) [+]
line wrap: on
line diff
--- a/tests/test-run-tests.t	Thu Oct 30 16:57:28 2014 -0500
+++ b/tests/test-run-tests.t	Thu Oct 30 17:52:01 2014 -0500
@@ -206,30 +206,8 @@
 (duplicate the failing test to get predictable output)
   $ cp test-failure.t test-failure-copy.t
 
-  $ $TESTDIR/run-tests.py --with-hg=`which hg` --jobs 2 test-failure*.t
-  
-  --- $TESTTMP/test-failure*.t (glob)
-  +++ $TESTTMP/test-failure*.t.err (glob)
-  @@ -1,4 +1,4 @@
-     $ echo babar
-  -  rataxes
-  +  babar
-   This is a noop statement so that
-   this test is still more bytes than success.
-  
-  ERROR: test-failure*.t output changed (glob)
-  !
-  --- $TESTTMP/test-failure*.t (glob)
-  +++ $TESTTMP/test-failure*.t.err (glob)
-  @@ -1,4 +1,4 @@
-     $ echo babar
-  -  rataxes
-  +  babar
-   This is a noop statement so that
-   this test is still more bytes than success.
-  
-  ERROR: test-failure*.t output changed (glob)
-  !
+  $ $TESTDIR/run-tests.py --with-hg=`which hg` --jobs 2 test-failure*.t -n
+  !!
   Failed test-failure*.t: output changed (glob)
   Failed test-failure*.t: output changed (glob)
   # Ran 2 tests, 0 skipped, 0 warned, 2 failed.