Mercurial > public > mercurial-scm > hg
diff tests/test-remove.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 | 7a58608281dd |
| children | 335e19c6b7fa |
line wrap: on
line diff
--- a/tests/test-remove.t Sun Dec 10 22:45:35 2017 -0500 +++ b/tests/test-remove.t Sun Dec 10 22:50:57 2017 -0500 @@ -322,8 +322,8 @@ \r (no-eol) (esc) deleting [===========================================>] 2/2\r (no-eol) (esc) \r (no-eol) (esc) - removing test/bar (glob) - removing test/foo (glob) + removing test/bar + removing test/foo exit code: 0 R test/bar R test/foo @@ -346,8 +346,8 @@ \r (no-eol) (esc) deleting [===========================================>] 2/2\r (no-eol) (esc) \r (no-eol) (esc) - removing test/bar (glob) - removing test/foo (glob) + removing test/bar + removing test/foo exit code: 0 R test/bar R test/foo @@ -370,8 +370,8 @@ \r (no-eol) (esc) deleting [===========================================>] 1/1\r (no-eol) (esc) \r (no-eol) (esc) - removing test/bar (glob) - not removing test/foo: file still exists (glob) + removing test/bar + not removing test/foo: file still exists exit code: 1 R test/bar ./foo @@ -393,7 +393,7 @@ \r (no-eol) (esc) deleting [===========================================>] 1/1\r (no-eol) (esc) \r (no-eol) (esc) - removing test/bar (glob) + removing test/bar exit code: 1 R test/bar ./foo @@ -413,7 +413,7 @@ \r (no-eol) (esc) deleting [===========================================>] 1/1\r (no-eol) (esc) \r (no-eol) (esc) - removing test/bar (glob) + removing test/bar exit code: 1 R test/bar ./foo @@ -436,8 +436,8 @@ \r (no-eol) (esc) deleting [===========================================>] 2/2\r (no-eol) (esc) \r (no-eol) (esc) - removing test/bar (glob) - removing test/foo (glob) + removing test/bar + removing test/foo exit code: 0 R test/bar R test/foo @@ -463,7 +463,7 @@ \r (no-eol) (esc) deleting [===========================================>] 1/1\r (no-eol) (esc) \r (no-eol) (esc) - removing issue1861/b/c/y (glob) + removing issue1861/b/c/y $ hg ci -m remove $ ls issue1861 x @@ -497,7 +497,7 @@ \r (no-eol) (esc) deleting [===========================================>] 1/1\r (no-eol) (esc) \r (no-eol) (esc) - removing d1/a (glob) + removing d1/a $ hg rm --after nosuch nosuch: * (glob)