Mercurial > public > mercurial-scm > hg-stable

diff tests/test-run-tests.t @ 21763:84cd5ee787ed

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
run-tests: hold iolock across diff/prompt when interactive Otherwise diff may get separated from the corresponding prompt by other threads. This required moving the interactive prompting from one helper method to another.
author Matt Mackall <mpm@selenic.com>
date Wed, 18 Jun 2014 20:51:49 -0500
parents f5fd1580a649
children 6c36dc6cd61a
line wrap: on
line diff
--- a/tests/test-run-tests.t	Wed Jun 18 15:26:07 2014 -0500
+++ b/tests/test-run-tests.t	Wed Jun 18 20:51:49 2014 -0500
@@ -160,9 +160,9 @@
      $ echo babar
   -  rataxes
   +  babar
-  
+  Accept this change? [n] 
   ERROR: test-failure.t output changed
-  Accept this change? [n] !.
+  !.
   Failed test-failure.t: output changed
   # Ran 2 tests, 0 skipped, 0 warned, 1 failed.
   python hash seed: * (glob)
@@ -182,8 +182,6 @@
      $ echo babar
   -  rataxes
   +  babar
-  
-  ERROR: test-failure.t output changed
   Accept this change? [n] ..
   # Ran 2 tests, 0 skipped, 0 warned, 0 failed.