tests/test-hook.t
changeset 28444 12fdf49fa4dd
parent 28109 b892e424f88c
child 28737 a3a01194a337
--- a/tests/test-hook.t	Thu Mar 10 16:04:09 2016 +0000
+++ b/tests/test-hook.t	Thu Mar 10 10:12:23 2016 -0800
@@ -530,13 +530,13 @@
   (run with --traceback for stack trace)
   [255]
 
-  $ hg pull ../a --traceback 2>&1 | egrep -v '^( +File|    [_a-zA-Z*(])'
+The second egrep is to filter out lines like '    ^', which are slightly
+different between Python 2.6 and Python 2.7.
+  $ hg pull ../a --traceback 2>&1 | egrep -v '^( +File|    [_a-zA-Z*(])' | egrep -v '^( )+(\^)?$'
   pulling from ../a
   searching for changes
   exception from first failed import attempt:
   Traceback (most recent call last):
-      
-      ^
   SyntaxError: invalid syntax
   exception from second failed import attempt:
   Traceback (most recent call last):