Mercurial > public > mercurial-scm > hg
diff tests/test-run-tests.t @ 35393:4441705b7111
tests: remove (glob) annotations that were only for '\' matches
# skip-blame because this was mechanically rewritten the following script. I
ran it on both *.t and *.py, but none of the *.py changes were proper. All *.t
ones appear to be, and they run without addition failures on both Windows and
Linux.
import argparse
import os
import re
ap = argparse.ArgumentParser()
ap.add_argument('path', nargs='+')
opts = ap.parse_args()
globre = re.compile(r'^(.*) \(glob\)(.*)$')
for p in opts.path:
tmp = p + '.tmp'
with open(p, 'rb') as src, open(tmp, 'wb') as dst:
for line in src:
m = globre.match(line)
if not m or '$LOCALIP' in line or '*' in line:
dst.write(line)
continue
if '?' in line[:-3] or ('?' in line[:-3] and line[-3:] != '(?)'):
dst.write(line)
continue
dst.write(m.group(1) + m.group(2) + '\n')
os.unlink(p)
os.rename(tmp, p)
author | Matt Harbison <matt_harbison@yahoo.com> |
---|---|
date | Sun, 10 Dec 2017 22:50:57 -0500 |
parents | 0432e54f4dbe |
children | 417fa23017f9 |
line wrap: on
line diff
--- a/tests/test-run-tests.t Sun Dec 10 22:45:35 2017 -0500 +++ b/tests/test-run-tests.t Sun Dec 10 22:50:57 2017 -0500 @@ -680,7 +680,7 @@ Interactive with custom view $ echo 'n' | rt -i --view echo - $TESTTMP/test-failure.t $TESTTMP/test-failure.t.err (glob) + $TESTTMP/test-failure.t $TESTTMP/test-failure.t.err Accept this change? [n]* (glob) ERROR: test-failure.t output changed !. @@ -692,7 +692,7 @@ View the fix $ echo 'y' | rt --view echo - $TESTTMP/test-failure.t $TESTTMP/test-failure.t.err (glob) + $TESTTMP/test-failure.t $TESTTMP/test-failure.t.err ERROR: test-failure.t output changed !. @@ -858,8 +858,8 @@ test --tmpdir support $ rt --tmpdir=$TESTTMP/keep test-success.t - Keeping testtmp dir: $TESTTMP/keep/child1/test-success.t (glob) - Keeping threadtmp dir: $TESTTMP/keep/child1 (glob) + Keeping testtmp dir: $TESTTMP/keep/child1/test-success.t + Keeping threadtmp dir: $TESTTMP/keep/child1 . # Ran 1 tests, 0 skipped, 0 failed.