# HG changeset patch # User Jun Wu # Date 2017-02-16 05:09:00 # Node ID d05fefbb5ab374d8050daac26d4b77325eb35d42 # Parent 225f574e064586197f94554f612d093e5d3f06be dumbhttp: use IPv6 if HGIPV6 is set to 1 This will fix flaky tests using dumbhttp. The patch was tested on gcc112.fsffrance.org using the following command: ./run-tests.py -j 40 --runs-per-test 120 test-bundle2-remote-changegroup.t diff --git a/tests/dumbhttp.py b/tests/dumbhttp.py --- a/tests/dumbhttp.py +++ b/tests/dumbhttp.py @@ -7,7 +7,9 @@ Small and dumb HTTP server for use in te """ import optparse +import os import signal +import socket import sys from mercurial import ( @@ -18,11 +20,17 @@ from mercurial import ( httpserver = util.httpserver OptionParser = optparse.OptionParser +if os.environ.get('HGIPV6', '0') == '1': + class simplehttpserver(httpserver.httpserver): + address_family = socket.AF_INET6 +else: + simplehttpserver = httpserver.httpserver + class simplehttpservice(object): def __init__(self, host, port): self.address = (host, port) def init(self): - self.httpd = httpserver.httpserver( + self.httpd = simplehttpserver( self.address, httpserver.simplehttprequesthandler) def run(self): self.httpd.serve_forever()