[PATCH 4 of 8 ipv6] runtests: set web.address to localhost

Jun Wu quark at fb.com
Fri Feb 17 03:40:59 EST 2017


Excerpts from Martin von Zweigbergk's message of 2017-02-16 22:54:58 -0800:
> On Thu, Feb 16, 2017 at 9:39 AM, Jun Wu <quark at fb.com> wrote:
> > # HG changeset patch
> > # User Jun Wu <quark at fb.com>
> > # Date 1487232809 28800
> > #      Thu Feb 16 00:13:29 2017 -0800
> > # Node ID 91137c500c4f8761c2d70bab7438d8d87959bd15
> > # Parent  72115e4deca500bd6da1929479a966b8b0eb0e1d
> > # Available At https://bitbucket.org/quark-zju/hg-draft 
> > #              hg pull https://bitbucket.org/quark-zju/hg-draft  -r 91137c500c4f
> > runtests: set web.address to localhost
> >
> > Previously, "hg serve" will listen on "", which is not clear which interface
> > it will actually listen on - it could listen on all interfaces (ex. 0.0.0.0
> > on IPv4).
> >
> > The run-tests.py script only checks "localhost" for available ports. So
> > let's make it the same for "hg serve" by explicitly setting "web.address" to
> > "localhost".
> 
> But there are still tests that try connect to 127.0.0.1. Lots of tests
> fail with this patch. I've queued up to 3/8. Can you resend the other
> 5, with this one moved after the $LOCALIP patches?

I see what you mean. I'll reorder the patch. Thanks!

> >
> > This resolves some IPv6 EADDRINUSE errors.
> >
> > diff --git a/tests/run-tests.py b/tests/run-tests.py
> > --- a/tests/run-tests.py
> > +++ b/tests/run-tests.py
> > @@ -918,4 +918,6 @@ class Test(unittest.TestCase):
> >          hgrc.write(b'usercache = %s\n' %
> >                     (os.path.join(self._testtmp, b'.cache/largefiles')))
> > +        hgrc.write(b'[web]\n')
> > +        hgrc.write(b'address = localhost\n')
> >
> >          for opt in self._extraconfigopts:
> > diff --git a/tests/test-basic.t b/tests/test-basic.t
> > --- a/tests/test-basic.t
> > +++ b/tests/test-basic.t
> > @@ -12,4 +12,5 @@ Create a repository:
> >    ui.mergemarkers=detailed
> >    ui.promptecho=True
> > +  web.address=localhost
> >    web.ipv6=True (?)
> >    $ hg init t
> > diff --git a/tests/test-commandserver.t b/tests/test-commandserver.t
> > --- a/tests/test-commandserver.t
> > +++ b/tests/test-commandserver.t
> > @@ -200,4 +200,5 @@ check that local configs for the cached
> >    ui.foo=bar
> >    ui.nontty=true
> > +  web.address=localhost
> >    web.ipv6=True (?)
> >    *** runcommand init foo
> > diff --git a/tests/test-http-bundle1.t b/tests/test-http-bundle1.t
> > --- a/tests/test-http-bundle1.t
> > +++ b/tests/test-http-bundle1.t
> > @@ -29,9 +29,9 @@ Test server address cannot be reused
> >  #if windows
> >    $ hg serve -p $HGPORT1 2>&1
> > -  abort: cannot start server at ':$HGPORT1': * (glob)
> > +  abort: cannot start server at 'localhost:$HGPORT1': * (glob)
> >    [255]
> >  #else
> >    $ hg serve -p $HGPORT1 2>&1
> > -  abort: cannot start server at ':$HGPORT1': Address already in use
> > +  abort: cannot start server at 'localhost:$HGPORT1': Address already in use
> >    [255]
> >  #endif
> > diff --git a/tests/test-http.t b/tests/test-http.t
> > --- a/tests/test-http.t
> > +++ b/tests/test-http.t
> > @@ -24,5 +24,5 @@ Test server address cannot be reused
> >  #else
> >    $ hg serve -p $HGPORT1 2>&1
> > -  abort: cannot start server at ':$HGPORT1': Address already in use
> > +  abort: cannot start server at 'localhost:$HGPORT1': Address already in use
> >    [255]
> >  #endif
> > diff --git a/tests/test-https.t b/tests/test-https.t
> > --- a/tests/test-https.t
> > +++ b/tests/test-https.t
> > @@ -37,9 +37,9 @@ Test server address cannot be reused
> >  #if windows
> >    $ hg serve -p $HGPORT --certificate=$PRIV 2>&1
> > -  abort: cannot start server at ':$HGPORT':
> > +  abort: cannot start server at 'localhost:$HGPORT':
> >    [255]
> >  #else
> >    $ hg serve -p $HGPORT --certificate=$PRIV 2>&1
> > -  abort: cannot start server at ':$HGPORT': Address already in use
> > +  abort: cannot start server at 'localhost:$HGPORT': Address already in use
> >    [255]
> >  #endif
> > _______________________________________________
> > Mercurial-devel mailing list
> > Mercurial-devel at mercurial-scm.org
> > https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel 


More information about the Mercurial-devel mailing list