diff tests/test-share.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 169c97d4e722
children b4b7427b5786
line wrap: on
line diff
--- a/tests/test-share.t	Sun Dec 10 22:45:35 2017 -0500
+++ b/tests/test-share.t	Sun Dec 10 22:50:57 2017 -0500
@@ -41,14 +41,14 @@
 Some sed versions appends newline, some don't, and some just fails
 
   $ cat .hg/sharedpath; echo
-  $TESTTMP/repo1/.hg (glob)
+  $TESTTMP/repo1/.hg
 
 trailing newline on .hg/sharedpath is ok
   $ hg tip -q
   0:d3873e73d99e
   $ echo '' >> .hg/sharedpath
   $ cat .hg/sharedpath
-  $TESTTMP/repo1/.hg (glob)
+  $TESTTMP/repo1/.hg
   $ hg tip -q
   0:d3873e73d99e
 
@@ -278,7 +278,7 @@
      bm3                       4:62f4ded848e4
    * bm4                       5:92793bfc8cad
   $ hg push -B bm4
-  pushing to $TESTTMP/repo3 (glob)
+  pushing to $TESTTMP/repo3
   searching for changes
   adding changesets
   adding manifests
@@ -348,7 +348,7 @@
      bm1                       3:b87954705719
      bm4                       5:92793bfc8cad
   $ hg --config "extensions.failpullbookmarks=$TESTTMP/failpullbookmarks.py" pull $TESTTMP/repo4
-  pulling from $TESTTMP/repo4 (glob)
+  pulling from $TESTTMP/repo4
   searching for changes
   no changes found
   adding remote bookmark bm3
@@ -358,7 +358,7 @@
      bm1                       3:b87954705719
      bm4                       5:92793bfc8cad
   $ hg pull $TESTTMP/repo4
-  pulling from $TESTTMP/repo4 (glob)
+  pulling from $TESTTMP/repo4
   searching for changes
   no changes found
   adding remote bookmark bm3
@@ -396,7 +396,7 @@
   $ hg share -U thisdir/orig thisdir/abs
   $ hg share -U --relative thisdir/abs thisdir/rel
   $ cat thisdir/rel/.hg/sharedpath
-  ../../orig/.hg (no-eol) (glob)
+  ../../orig/.hg (no-eol)
   $ grep shared thisdir/*/.hg/requires
   thisdir/abs/.hg/requires:shared
   thisdir/rel/.hg/requires:shared
@@ -406,22 +406,22 @@
 
   $ cd thisdir
   $ hg -R rel root
-  $TESTTMP/thisdir/rel (glob)
+  $TESTTMP/thisdir/rel
   $ cd ..
 
 now test that relative paths really are relative, survive across
 renames and changes of PWD
 
   $ hg -R thisdir/abs root
-  $TESTTMP/thisdir/abs (glob)
+  $TESTTMP/thisdir/abs
   $ hg -R thisdir/rel root
-  $TESTTMP/thisdir/rel (glob)
+  $TESTTMP/thisdir/rel
   $ mv thisdir thatdir
   $ hg -R thatdir/abs root
-  abort: .hg/sharedpath points to nonexistent directory $TESTTMP/thisdir/orig/.hg! (glob)
+  abort: .hg/sharedpath points to nonexistent directory $TESTTMP/thisdir/orig/.hg!
   [255]
   $ hg -R thatdir/rel root
-  $TESTTMP/thatdir/rel (glob)
+  $TESTTMP/thatdir/rel
 
 test unshare relshared repo