changeset 31673:6a2959acae1a

runtests: change local IP glob pattern from "127.0.0.1" to "$LOCALIP" This is similar to what 348b2b9da703 does. Since 636cf3f7620d has changed "127.0.0.1" to "$LOCALIP". The glob pattern needs update accordingly. It is expected to fix tests running in some BSD jails.
author Jun Wu <quark@fb.com>
date Sun, 26 Mar 2017 19:57:17 -0700
parents e6fd7930cf0b
children b33e352c365c
files contrib/check-code.py tests/run-tests.py tests/test-run-tests.t
diffstat 3 files changed, 8 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/contrib/check-code.py	Mon Mar 27 16:00:47 2017 +0200
+++ b/contrib/check-code.py	Sun Mar 26 19:57:17 2017 -0700
@@ -210,8 +210,8 @@
   ],
   # warnings
   [
-    (r'^  (?!.*127\.0\.0\.1)[^*?/\n]* \(glob\)$',
-     "glob match with no glob string (?, *, /, and 127.0.0.1)"),
+    (r'^  (?!.*\$LOCALIP)[^*?/\n]* \(glob\)$',
+     "glob match with no glob string (?, *, /, and $LOCALIP)"),
   ]
 ]
 
--- a/tests/run-tests.py	Mon Mar 27 16:00:47 2017 +0200
+++ b/tests/run-tests.py	Sun Mar 26 19:57:17 2017 -0700
@@ -1034,7 +1034,7 @@
     re.compile(br'^pulling from \$TESTTMP/.*[^)]$'),
     # Not all platforms have 127.0.0.1 as loopback (though most do),
     # so we always glob that too.
-    re.compile(br'.*127.0.0.1.*$'),
+    re.compile(br'.*\$LOCALIP.*$'),
 ]
 
 bchr = chr
@@ -1342,7 +1342,7 @@
                         return True
                 return b'-glob'
             return True
-        el = el.replace(b'127.0.0.1', b'*')
+        el = el.replace(b'$LOCALIP', b'*')
         i, n = 0, len(el)
         res = b''
         while i < n:
--- a/tests/test-run-tests.t	Mon Mar 27 16:00:47 2017 +0200
+++ b/tests/test-run-tests.t	Sun Mar 26 19:57:17 2017 -0700
@@ -735,9 +735,11 @@
 
   $ rm -f test-glob-backslash.t
 
-Test globbing of 127.0.0.1
+Test globbing of local IP addresses
   $ echo 172.16.18.1
-  127.0.0.1 (glob)
+  $LOCALIP (glob)
+  $ echo dead:beef::1
+  $LOCALIP (glob)
 
 Test reusability for third party tools
 ======================================