Patchwork runtests: change local IP glob pattern from "127.0.0.1" to "$LOCALIP"

login
register
mail settings
Submitter Jun Wu
Date March 27, 2017, 2:58 a.m.
Message ID <82f3dbff593061813035.1490583482@localhost.localdomain>
Download mbox | patch
Permalink /patch/19729/
State Accepted
Headers show

Comments

Jun Wu - March 27, 2017, 2:58 a.m.
# HG changeset patch
# User Jun Wu <quark@fb.com>
# Date 1490583437 25200
#      Sun Mar 26 19:57:17 2017 -0700
# Node ID 82f3dbff59306181303549600cd7a307da667d05
# Parent  38ff33314869869535eb8f5c9cf4fa688847010e
# Available At https://bitbucket.org/quark-zju/hg-draft
#              hg pull https://bitbucket.org/quark-zju/hg-draft -r 82f3dbff5930
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.
Augie Fackler - March 27, 2017, 6:43 p.m.
> On Mar 26, 2017, at 22:58, Jun Wu <quark@fb.com> wrote:
> 
> # HG changeset patch
> # User Jun Wu <quark@fb.com>
> # Date 1490583437 25200
> #      Sun Mar 26 19:57:17 2017 -0700
> # Node ID 82f3dbff59306181303549600cd7a307da667d05
> # Parent  38ff33314869869535eb8f5c9cf4fa688847010e
> # Available At https://bitbucket.org/quark-zju/hg-draft
> #              hg pull https://bitbucket.org/quark-zju/hg-draft -r 82f3dbff5930
> runtests: change local IP glob pattern from "127.0.0.1" to "$LOCALIP"

Very nice, this fixes some BSD issues. Queued with delight (now that I've resurrected the buildbot).

> 
> 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.
> 
> diff --git a/contrib/check-code.py b/contrib/check-code.py
> --- a/contrib/check-code.py
> +++ b/contrib/check-code.py
> @@ -211,6 +211,6 @@ utestpats = [
>   # 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)"),
>   ]
> ]
> diff --git a/tests/run-tests.py b/tests/run-tests.py
> --- a/tests/run-tests.py
> +++ b/tests/run-tests.py
> @@ -1035,5 +1035,5 @@ checkcodeglobpats = [
>     # 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.*$'),
> ]
> 
> @@ -1343,5 +1343,5 @@ class TTest(Test):
>                 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''
> diff --git a/tests/test-run-tests.t b/tests/test-run-tests.t
> --- a/tests/test-run-tests.t
> +++ b/tests/test-run-tests.t
> @@ -736,7 +736,9 @@ backslash on end of line with glob match
>   $ 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
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel@mercurial-scm.org
> https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

Patch

diff --git a/contrib/check-code.py b/contrib/check-code.py
--- a/contrib/check-code.py
+++ b/contrib/check-code.py
@@ -211,6 +211,6 @@  utestpats = [
   # 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)"),
   ]
 ]
diff --git a/tests/run-tests.py b/tests/run-tests.py
--- a/tests/run-tests.py
+++ b/tests/run-tests.py
@@ -1035,5 +1035,5 @@  checkcodeglobpats = [
     # 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.*$'),
 ]
 
@@ -1343,5 +1343,5 @@  class TTest(Test):
                 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''
diff --git a/tests/test-run-tests.t b/tests/test-run-tests.t
--- a/tests/test-run-tests.t
+++ b/tests/test-run-tests.t
@@ -736,7 +736,9 @@  backslash on end of line with glob match
   $ 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