Allow tests to run in parallel.

tests/run-tests.py

@@ -1,472 +1,556 b''
 #!/usr/bin/env python
 #
 # run-tests.py - Run a set of tests on Mercurial
 #
 # Copyright 2006 Matt Mackall <[e-mail]>
 #
 # This software may be used and distributed according to the terms
 # of the GNU General Public License, incorporated herein by reference.
 
 import difflib
 import errno
 import optparse
 import os
 import popen2
 import re
 import shutil
 import signal
 import sys
 import tempfile
 import time
 
 # hghave reserved exit code to skip test
 SKIPPED_STATUS = 80
 
 required_tools = ["python", "diff", "grep", "unzip", "gunzip", "bunzip2", "sed"]
 
 parser = optparse.OptionParser("%prog [options] [tests]")
 parser.add_option("-C", "--annotate", action="store_true",
     help="output files annotated with coverage")
+parser.add_option("--child", type="int",
+    help="run as child process, summary to given fd")
 parser.add_option("-c", "--cover", action="store_true",
     help="print a test coverage report")
 parser.add_option("-f", "--first", action="store_true",
     help="exit on the first test failure")
 parser.add_option("-i", "--interactive", action="store_true",
     help="prompt to accept changed output")
+parser.add_option("-j", "--jobs", type="int",
+    help="number of jobs to run in parallel")
 parser.add_option("-R", "--restart", action="store_true",
     help="restart at last error")
+parser.add_option("-p", "--port", type="int",
+    help="port on which servers should listen")
 parser.add_option("-r", "--retest", action="store_true",
     help="retest failed tests")
 parser.add_option("-s", "--cover_stdlib", action="store_true",
     help="print a test coverage report inc. standard libraries")
 parser.add_option("-t", "--timeout", type="int",
     help="kill errant tests after TIMEOUT seconds")
 parser.add_option("-v", "--verbose", action="store_true",
     help="output verbose messages")
+parser.add_option("--with-hg", type="string",
+    help="test existing install at given location")
 
-parser.set_defaults(timeout=180)
+parser.set_defaults(jobs=1, port=20059, timeout=180)
 (options, args) = parser.parse_args()
 verbose = options.verbose
 coverage = options.cover or options.cover_stdlib or options.annotate
 python = sys.executable
 
+if options.jobs < 1:
+    print >> sys.stderr, 'ERROR: -j/--jobs must be positive'
+    sys.exit(1)
+if options.interactive and options.jobs > 1:
+    print >> sys.stderr, 'ERROR: cannot mix -interactive and --jobs > 1'
+    sys.exit(1)
+
 def vlog(*msg):
     if verbose:
         for m in msg:
             print m,
         print
 
 def splitnewlines(text):
     '''like str.splitlines, but only split on newlines.
     keep line endings.'''
     i = 0
     lines = []
     while True:
         n = text.find('\n', i)
         if n == -1:
             last = text[i:]
             if last:
                 lines.append(last)
             return lines
         lines.append(text[i:n+1])
         i = n + 1
 
 def extract_missing_features(lines):
     '''Extract missing/unknown features log lines as a list'''
     missing = []
     for line in lines:
         if not line.startswith('hghave: '):
             continue
         line = line.splitlines()[0]
         missing.append(line[8:])
 
     return missing
 
 def show_diff(expected, output):
     for line in difflib.unified_diff(expected, output,
             "Expected output", "Test output"):
         sys.stdout.write(line)
 
 def find_program(program):
     """Search PATH for a executable program"""
     for p in os.environ.get('PATH', os.defpath).split(os.pathsep):
         name = os.path.join(p, program)
         if os.access(name, os.X_OK):
             return name
     return None
 
 def check_required_tools():
     # Before we go any further, check for pre-requisite tools
     # stuff from coreutils (cat, rm, etc) are not tested
     for p in required_tools:
         if os.name == 'nt':
             p += '.exe'
         found = find_program(p)
         if found:
             vlog("# Found prerequisite", p, "at", found)
         else:
             print "WARNING: Did not find prerequisite tool: "+p
 
 def cleanup_exit():
     if verbose:
         print "# Cleaning up HGTMP", HGTMP
     shutil.rmtree(HGTMP, True)
 
 def use_correct_python():
     # some tests run python interpreter. they must use same
     # interpreter we use or bad things will happen.
     exedir, exename = os.path.split(sys.executable)
     if exename == 'python':
         path = find_program('python')
         if os.path.dirname(path) == exedir:
             return
     vlog('# Making python executable in test path use correct Python')
     my_python = os.path.join(BINDIR, 'python')
     try:
         os.symlink(sys.executable, my_python)
     except AttributeError:
         # windows fallback
         shutil.copyfile(sys.executable, my_python)
         shutil.copymode(sys.executable, my_python)
 
 def install_hg():
     global python
     vlog("# Performing temporary installation of HG")
     installerrs = os.path.join("tests", "install.err")
 
     # Run installer in hg root
     os.chdir(os.path.join(os.path.dirname(sys.argv[0]), '..'))
     cmd = ('%s setup.py clean --all'
            ' install --force --home="%s" --install-lib="%s"'
            ' --install-scripts="%s" >%s 2>&1'
            % (sys.executable, INST, PYTHONDIR, BINDIR, installerrs))
     vlog("# Running", cmd)
     if os.system(cmd) == 0:
         if not verbose:
             os.remove(installerrs)
     else:
         f = open(installerrs)
         for line in f:
             print line,
         f.close()
         sys.exit(1)
     os.chdir(TESTDIR)
 
     os.environ["PATH"] = "%s%s%s" % (BINDIR, os.pathsep, os.environ["PATH"])
 
     pydir = os.pathsep.join([PYTHONDIR, TESTDIR])
     pythonpath = os.environ.get("PYTHONPATH")
     if pythonpath:
         pythonpath = pydir + os.pathsep + pythonpath
     else:
         pythonpath = pydir
     os.environ["PYTHONPATH"] = pythonpath
 
     use_correct_python()
 
     if coverage:
         vlog("# Installing coverage wrapper")
         os.environ['COVERAGE_FILE'] = COVERAGE_FILE
         if os.path.exists(COVERAGE_FILE):
             os.unlink(COVERAGE_FILE)
         # Create a wrapper script to invoke hg via coverage.py
         os.rename(os.path.join(BINDIR, "hg"), os.path.join(BINDIR, "_hg.py"))
         f = open(os.path.join(BINDIR, 'hg'), 'w')
         f.write('#!' + sys.executable + '\n')
         f.write('import sys, os; os.execv(sys.executable, [sys.executable, '
                 '"%s", "-x", "%s"] + sys.argv[1:])\n' %
                 (os.path.join(TESTDIR, 'coverage.py'),
                  os.path.join(BINDIR, '_hg.py')))
         f.close()
         os.chmod(os.path.join(BINDIR, 'hg'), 0700)
         python = '"%s" "%s" -x' % (sys.executable,
                                    os.path.join(TESTDIR,'coverage.py'))
 
 def output_coverage():
     vlog("# Producing coverage report")
     omit = [BINDIR, TESTDIR, PYTHONDIR]
     if not options.cover_stdlib:
         # Exclude as system paths (ignoring empty strings seen on win)
         omit += [x for x in sys.path if x != '']
     omit = ','.join(omit)
     os.chdir(PYTHONDIR)
     cmd = '"%s" "%s" -i -r "--omit=%s"' % (
         sys.executable, os.path.join(TESTDIR, 'coverage.py'), omit)
     vlog("# Running: "+cmd)
     os.system(cmd)
     if options.annotate:
         adir = os.path.join(TESTDIR, 'annotated')
         if not os.path.isdir(adir):
             os.mkdir(adir)
         cmd = '"%s" "%s" -i -a "--directory=%s" "--omit=%s"' % (
             sys.executable, os.path.join(TESTDIR, 'coverage.py'),
             adir, omit)
         vlog("# Running: "+cmd)
         os.system(cmd)
 
 class Timeout(Exception):
     pass
 
 def alarmed(signum, frame):
     raise Timeout
 
 def run(cmd):
     """Run command in a sub-process, capturing the output (stdout and stderr).
     Return the exist code, and output."""
     # TODO: Use subprocess.Popen if we're running on Python 2.4
     if os.name == 'nt':
         tochild, fromchild = os.popen4(cmd)
         tochild.close()
         output = fromchild.read()
         ret = fromchild.close()
         if ret == None:
             ret = 0
     else:
         proc = popen2.Popen4(cmd)
         try:
             output = ''
             proc.tochild.close()
             output = proc.fromchild.read()
             ret = proc.wait()
             if os.WIFEXITED(ret):
                 ret = os.WEXITSTATUS(ret)
         except Timeout:
             vlog('# Process %d timed out - killing it' % proc.pid)
             os.kill(proc.pid, signal.SIGTERM)
             ret = proc.wait()
             if ret == 0:
                 ret = signal.SIGTERM << 8
             output += ("\n### Abort: timeout after %d seconds.\n"
                        % options.timeout)
     return ret, splitnewlines(output)
 
 def run_one(test):
     '''tristate output:
     None -> skipped
     True -> passed
     False -> failed'''
 
     vlog("# Test", test)
     if not verbose:
         sys.stdout.write('.')
         sys.stdout.flush()
 
     # create a fresh hgrc
     hgrc = file(HGRCPATH, 'w+')
     hgrc.write('[ui]\n')
     hgrc.write('slash = True\n')
     hgrc.close()
 
     err = os.path.join(TESTDIR, test+".err")
     ref = os.path.join(TESTDIR, test+".out")
     testpath = os.path.join(TESTDIR, test)
 
     if os.path.exists(err):
         os.remove(err)       # Remove any previous output files
 
     # Make a tmp subdirectory to work in
     tmpd = os.path.join(HGTMP, test)
     os.mkdir(tmpd)
     os.chdir(tmpd)
 
     try:
         tf = open(testpath)
         firstline = tf.readline().rstrip()
         tf.close()
     except:
         firstline = ''
     lctest = test.lower()
 
     if lctest.endswith('.py') or firstline == '#!/usr/bin/env python':
         cmd = '%s "%s"' % (python, testpath)
     elif lctest.endswith('.bat'):
         # do not run batch scripts on non-windows
         if os.name != 'nt':
             print '\nSkipping %s: batch script' % test
             return None
         # To reliably get the error code from batch files on WinXP,
         # the "cmd /c call" prefix is needed. Grrr
         cmd = 'cmd /c call "%s"' % testpath
     else:
         # do not run shell scripts on windows
         if os.name == 'nt':
             print '\nSkipping %s: shell script' % test
             return None
         # do not try to run non-executable programs
         if not os.access(testpath, os.X_OK):
             print '\nSkipping %s: not executable' % test
             return None
         cmd = '"%s"' % testpath
 
     if options.timeout > 0:
         signal.alarm(options.timeout)
 
     vlog("# Running", cmd)
     ret, out = run(cmd)
     vlog("# Ret was:", ret)
 
     if options.timeout > 0:
         signal.alarm(0)
 
     skipped = (ret == SKIPPED_STATUS)
     diffret = 0
     # If reference output file exists, check test output against it
     if os.path.exists(ref):
         f = open(ref, "r")
         ref_out = splitnewlines(f.read())
         f.close()
     else:
         ref_out = []
     if not skipped and out != ref_out:
         diffret = 1
         print "\nERROR: %s output changed" % (test)
         show_diff(ref_out, out)
     if skipped:
         missing = extract_missing_features(out)
         if not missing:
             missing = ['irrelevant']
         print '\nSkipping %s: %s' % (test, missing[-1])
     elif ret:
         print "\nERROR: %s failed with error code %d" % (test, ret)
     elif diffret:
         ret = diffret
 
     if ret != 0 and not skipped:
         # Save errors to a file for diagnosis
         f = open(err, "wb")
         for line in out:
             f.write(line)
         f.close()
 
     # Kill off any leftover daemon processes
     try:
         fp = file(DAEMON_PIDS)
         for line in fp:
             try:
                 pid = int(line)
             except ValueError:
                 continue
             try:
                 os.kill(pid, 0)
                 vlog('# Killing daemon process %d' % pid)
                 os.kill(pid, signal.SIGTERM)
                 time.sleep(0.25)
                 os.kill(pid, 0)
                 vlog('# Daemon process %d is stuck - really killing it' % pid)
                 os.kill(pid, signal.SIGKILL)
             except OSError, err:
                 if err.errno != errno.ESRCH:
                     raise
         fp.close()
         os.unlink(DAEMON_PIDS)
     except IOError:
         pass
 
     os.chdir(TESTDIR)
     shutil.rmtree(tmpd, True)
     if skipped:
         return None
     return ret == 0
 
+if not options.child:
+    os.umask(022)
 
-os.umask(022)
-
-check_required_tools()
+    check_required_tools()
 
 # Reset some environment variables to well-known values so that
 # the tests produce repeatable output.
 os.environ['LANG'] = os.environ['LC_ALL'] = 'C'
 os.environ['TZ'] = 'GMT'
 
 TESTDIR = os.environ["TESTDIR"] = os.getcwd()
 HGTMP   = os.environ["HGTMP"]   = tempfile.mkdtemp("", "hgtests.")
-DAEMON_PIDS = os.environ["DAEMON_PIDS"] = os.path.join(HGTMP, 'daemon.pids')
-HGRCPATH = os.environ["HGRCPATH"] = os.path.join(HGTMP, '.hgrc')
+DAEMON_PIDS = None
+HGRCPATH = None
 
 os.environ["HGEDITOR"] = sys.executable + ' -c "import sys; sys.exit(0)"'
 os.environ["HGMERGE"]  = ('python "%s" -L my -L other'
-                          % os.path.join(TESTDIR, os.path.pardir, 'contrib',
-                                         'simplemerge'))
+                          % os.path.join(TESTDIR, os.path.pardir,
+                                         'contrib', 'simplemerge'))
 os.environ["HGUSER"]   = "test"
 os.environ["HGENCODING"] = "ascii"
 os.environ["HGENCODINGMODE"] = "strict"
+os.environ["HGPORT"] = str(options.port)
+os.environ["HGPORT1"] = str(options.port + 1)
+os.environ["HGPORT2"] = str(options.port + 2)
 
-vlog("# Using TESTDIR", TESTDIR)
-vlog("# Using HGTMP", HGTMP)
-
-INST = os.path.join(HGTMP, "install")
+if options.with_hg:
+    INST = options.with_hg
+else:
+    INST = os.path.join(HGTMP, "install")
 BINDIR = os.path.join(INST, "bin")
 PYTHONDIR = os.path.join(INST, "lib", "python")
 COVERAGE_FILE = os.path.join(TESTDIR, ".coverage")
 
-try:
+def run_children(tests):
+    if not options.with_hg:
+        install_hg()
+
+    optcopy = dict(options.__dict__)
+    optcopy['jobs'] = 1
+    optcopy['with_hg'] = INST
+    opts = []
+    for opt, value in optcopy.iteritems():
+        name = '--' + opt.replace('_', '-')
+        if value is True:
+            opts.append(name)
+        elif value is not None:
+            opts.append(name + '=' + str(value))
+
+    tests.reverse()
+    jobs = [[] for j in xrange(options.jobs)]
+    while tests:
+        for j in xrange(options.jobs):
+            if not tests: break
+            jobs[j].append(tests.pop())
+    fps = {}
+    for j in xrange(len(jobs)):
+        job = jobs[j]
+        if not job:
+            continue
+        rfd, wfd = os.pipe()
+        childopts = ['--child=%d' % wfd, '--port=%d' % (options.port + j * 3)]
+        cmdline = [python, sys.argv[0]] + opts + childopts + job
+        vlog(' '.join(cmdline))
+        fps[os.spawnvp(os.P_NOWAIT, cmdline[0], cmdline)] = os.fdopen(rfd, 'r')
+        os.close(wfd)
+    failures = 0
+    tested, skipped, failed = 0, 0, 0
+    while fps:
+        pid, status = os.wait()
+        fp = fps.pop(pid)
+        test, skip, fail = map(int, fp.read().splitlines())
+        tested += test
+        skipped += skip
+        failed += fail
+        vlog('pid %d exited, status %d' % (pid, status))
+        failures |= status
+    print "\n# Ran %d tests, %d skipped, %d failed." % (
+        tested, skipped, failed)
+    sys.exit(failures != 0)
+
+def run_tests(tests):
+    global DAEMON_PIDS, HGRCPATH
+    DAEMON_PIDS = os.environ["DAEMON_PIDS"] = os.path.join(HGTMP, 'daemon.pids')
+    HGRCPATH = os.environ["HGRCPATH"] = os.path.join(HGTMP, '.hgrc')
+
     try:
-        install_hg()
+        if not options.with_hg:
+            install_hg()
 
         if options.timeout > 0:
             try:
                 signal.signal(signal.SIGALRM, alarmed)
                 vlog('# Running tests with %d-second timeout' %
                      options.timeout)
             except AttributeError:
                 print 'WARNING: cannot run tests with timeouts'
                 options.timeout = 0
 
         tested = 0
         failed = 0
         skipped = 0
 
-        if len(args) == 0:
-            args = os.listdir(".")
-            args.sort()
-
-
-        tests = []
-        for test in args:
-            if (test.startswith("test-") and '~' not in test and
-                ('.' not in test or test.endswith('.py') or
-                 test.endswith('.bat'))):
-                tests.append(test)
-
         if options.restart:
             orig = list(tests)
             while tests:
                 if os.path.exists(tests[0] + ".err"):
                     break
                 tests.pop(0)
             if not tests:
                 print "running all tests"
                 tests = orig
 
         for test in tests:
             if options.retest and not os.path.exists(test + ".err"):
                 skipped += 1
                 continue
             ret = run_one(test)
             if ret is None:
                 skipped += 1
             elif not ret:
                 if options.interactive:
                     print "Accept this change? [n] ",
                     answer = sys.stdin.readline().strip()
                     if answer.lower() in "y yes".split():
                         os.rename(test + ".err", test + ".out")
                         tested += 1
                         continue
                 failed += 1
                 if options.first:
                     break
             tested += 1
 
-        print "\n# Ran %d tests, %d skipped, %d failed." % (tested, skipped,
-                                                            failed)
+        if options.child:
+            fp = os.fdopen(options.child, 'w')
+            fp.write('%d\n%d\n%d\n' % (tested, skipped, failed))
+            fp.close()
+        else:
+            print "\n# Ran %d tests, %d skipped, %d failed." % (
+                tested, skipped, failed)
+
         if coverage:
             output_coverage()
     except KeyboardInterrupt:
         failed = True
         print "\ninterrupted!"
+
+    if failed:
+        sys.exit(1)
+
+if len(args) == 0:
+    args = os.listdir(".")
+    args.sort()
+
+tests = []
+for test in args:
+    if (test.startswith("test-") and '~' not in test and
+        ('.' not in test or test.endswith('.py') or
+         test.endswith('.bat'))):
+        tests.append(test)
+
+vlog("# Using TESTDIR", TESTDIR)
+vlog("# Using HGTMP", HGTMP)
+
+try:
+    if len(tests) > 1 and options.jobs > 1:
+        run_children(tests)
+    else:
+        run_tests(tests)
 finally:
     cleanup_exit()
-
-if failed:
-    sys.exit(1)

tests/test-archive

@@ -1,76 +1,76 b''
 #!/bin/sh
 
 mkdir test
 cd test
 hg init
 echo foo>foo
 hg commit -Am 1 -d '1 0'
 echo bar>bar
 hg commit -Am 2 -d '2 0'
 mkdir baz
 echo bletch>baz/bletch
 hg commit -Am 3 -d '1000000000 0'
 echo "[web]" >> .hg/hgrc
 echo "name = test-archive" >> .hg/hgrc
 echo "allow_archive = gz bz2, zip" >> .hg/hgrc
-hg serve -p 20059 -d --pid-file=hg.pid
+hg serve -p $HGPORT -d --pid-file=hg.pid
 cat hg.pid >> $DAEMON_PIDS
 
 TIP=`hg id -v | cut -f1 -d' '`
 QTIP=`hg id -q`
 cat > getarchive.py <<EOF
-import sys, urllib2
+import os, sys, urllib2
 node, archive = sys.argv[1:]
-f = urllib2.urlopen('http://127.0.0.1:20059/?cmd=archive;node=%s;type=%s'
-                    % (node, archive))
+f = urllib2.urlopen('http://127.0.0.1:%s/?cmd=archive;node=%s;type=%s'
+                    % (os.environ['HGPORT'], node, archive))
 sys.stdout.write(f.read())
 EOF
 http_proxy= python getarchive.py "$TIP" gz | gunzip | tar tf - | sed "s/$QTIP/TIP/"
 http_proxy= python getarchive.py "$TIP" bz2 | bunzip2 | tar tf - | sed "s/$QTIP/TIP/"
 http_proxy= python getarchive.py "$TIP" zip > archive.zip
 unzip -t archive.zip | sed "s/$QTIP/TIP/"
 
 hg archive -t tar test.tar
 tar tf test.tar
 
 hg archive -t tbz2 -X baz test.tar.bz2
 bunzip2 -dc test.tar.bz2 | tar tf -
 
 hg archive -t tgz -p %b-%h test-%h.tar.gz
 gzip -dc test-$QTIP.tar.gz | tar tf - | sed "s/$QTIP/TIP/"
 
 cat > md5comp.py <<EOF
 import md5, sys
 f1, f2 = sys.argv[1:3]
 h1 = md5.md5(file(f1, 'rb').read()).hexdigest()
 h2 = md5.md5(file(f2, 'rb').read()).hexdigest()
 print h1 == h2 or "md5 differ: " + repr((h1, h2))
 EOF
 
 # archive name is stored in the archive, so create similar
 # archives and rename them afterwards.
 hg archive -t tgz tip.tar.gz
 mv tip.tar.gz tip1.tar.gz
 sleep 1
 hg archive -t tgz tip.tar.gz
 mv tip.tar.gz tip2.tar.gz
 python md5comp.py tip1.tar.gz tip2.tar.gz
 
 hg archive -t zip -p /illegal test.zip
 hg archive -t zip -p very/../bad test.zip
 
 hg archive -t zip -r 2 test.zip
 unzip -t test.zip
 
 hg archive -t tar - | tar tf - | sed "s/$QTIP/TIP/"
 
 hg archive -r 0 -t tar rev-%r.tar
 if [ -f rev-0.tar ]; then
     echo 'rev-0.tar created'
 fi
 
 echo '% empty repo'
 hg init ../empty
 cd ../empty
 hg archive ../test-empty
 exit 0

tests/test-bad-pull

@@ -1,30 +1,30 b''
 #!/bin/sh
 
-hg clone http://localhost:20059/ copy
+hg clone http://localhost:$HGPORT/ copy
 echo $?
 test -d copy || echo copy: No such file or directory
 
 cat > dumb.py <<EOF
-import BaseHTTPServer, SimpleHTTPServer, signal
+import BaseHTTPServer, SimpleHTTPServer, os, signal
 
 def run(server_class=BaseHTTPServer.HTTPServer,
         handler_class=SimpleHTTPServer.SimpleHTTPRequestHandler):
-    server_address = ('localhost', 20059)
+    server_address = ('localhost', int(os.environ['HGPORT']))
     httpd = server_class(server_address, handler_class)
     httpd.serve_forever()
 
 signal.signal(signal.SIGTERM, lambda x: sys.exit(0))
 run()
 EOF
 
 python dumb.py 2>/dev/null &
 echo $! >> $DAEMON_PIDS
 
 # give the server some time to start running
 sleep 1
 
-http_proxy= hg clone http://localhost:20059/foo copy2 2>&1 | \
+http_proxy= hg clone http://localhost:$HGPORT/foo copy2 2>&1 | \
     sed -e 's/404.*/404/' -e 's/Date:.*/Date:/'
 echo $?
 
 kill $!

tests/test-hgweb

@@ -1,13 +1,13 b''
 #!/bin/sh
 
 hg init test
 cd test
 mkdir da
 echo foo > da/foo
 echo foo > foo
 hg ci -Ambase -d '0 0'
-hg serve -p 20060 -d --pid-file=hg.pid
+hg serve -p $HGPORT -d --pid-file=hg.pid
 echo % manifest
-("$TESTDIR/get-with-headers.py" localhost:20060 '/file/tip/?style=raw')
-("$TESTDIR/get-with-headers.py" localhost:20060 '/file/tip/da?style=raw')
+("$TESTDIR/get-with-headers.py" localhost:$HGPORT '/file/tip/?style=raw')
+("$TESTDIR/get-with-headers.py" localhost:$HGPORT '/file/tip/da?style=raw')
 kill `cat hg.pid`

tests/test-http

@@ -1,38 +1,38 b''
 #!/bin/sh
 
 cp "$TESTDIR"/printenv.py .
 
 hg init test
 cd test
 echo foo>foo
 hg commit -A -d '0 0' -m 1
-hg --config server.uncompressed=True serve -p 20059 -d --pid-file=../hg1.pid
-hg serve -p 20060 -d --pid-file=../hg2.pid
+hg --config server.uncompressed=True serve -p $HGPORT -d --pid-file=../hg1.pid
+hg serve -p $HGPORT1 -d --pid-file=../hg2.pid
 # Test server address cannot be reused
-hg serve -p 20060 2>&1 | sed -e 's/abort: cannot start server:.*/abort: cannot start server:/'
+hg serve -p $HGPORT1 2>&1 | sed -e 's/abort: cannot start server:.*/abort: cannot start server:/'
 cd ..
 cat hg1.pid hg2.pid >> $DAEMON_PIDS
 
 echo % clone via stream
-http_proxy= hg clone --uncompressed http://localhost:20059/ copy 2>&1 | \
+http_proxy= hg clone --uncompressed http://localhost:$HGPORT/ copy 2>&1 | \
   sed -e 's/[0-9][0-9.]*/XXX/g' -e 's/[KM]\(B\/sec\)/X\1/'
 hg verify -R copy
 
 echo % try to clone via stream, should use pull instead
-http_proxy= hg clone --uncompressed http://localhost:20060/ copy2
+http_proxy= hg clone --uncompressed http://localhost:$HGPORT1/ copy2
 
 echo % clone via pull
-http_proxy= hg clone http://localhost:20059/ copy-pull
+http_proxy= hg clone http://localhost:$HGPORT1/ copy-pull
 hg verify -R copy-pull
 
 cd test
 echo bar > bar
 hg commit -A -d '1 0' -m 2
 cd ..
 
 echo % pull
 cd copy-pull
 echo '[hooks]' >> .hg/hgrc
 echo 'changegroup = python ../printenv.py changegroup' >> .hg/hgrc
-hg pull
+hg pull | sed -e 's,:[0-9][0-9]*/,/,'
 cd ..

tests/test-http-clone-r

@@ -1,78 +1,78 b''
 #!/bin/sh
 
 hg init remote
 cd remote
 echo "# creating 'remote'"
 cat >>afile <<EOF
 0
 EOF
 hg add afile
 hg commit -m "0.0"
 cat >>afile <<EOF
 1
 EOF
 hg commit -m "0.1"
 cat >>afile <<EOF
 2
 EOF
 hg commit -m "0.2"
 cat >>afile <<EOF
 3
 EOF
 hg commit -m "0.3"
 hg update -C 0
 cat >>afile <<EOF
 1
 EOF
 hg commit -m "1.1"
 cat >>afile <<EOF
 2
 EOF
 hg commit -m "1.2"
 cat >fred <<EOF
 a line
 EOF
 cat >>afile <<EOF
 3
 EOF
 hg add fred
 hg commit -m "1.3"
 hg mv afile adifferentfile
 hg commit -m "1.3m"
 hg update -C 3
 hg mv afile anotherfile
 hg commit -m "0.3m"
 hg debugindex .hg/store/data/afile.i
 hg debugindex .hg/store/data/adifferentfile.i
 hg debugindex .hg/store/data/anotherfile.i
 hg debugindex .hg/store/data/fred.i
 hg debugindex .hg/store/00manifest.i
 hg verify
 echo "# Starting server"
-hg serve -p 20061 -d --pid-file=../hg1.pid
+hg serve -p $HGPORT -d --pid-file=../hg1.pid
 cd ..
 cat hg1.pid >> $DAEMON_PIDS
 
 echo "# clone remote via stream"
 for i in 0 1 2 3 4 5 6 7 8; do
-   hg clone -r "$i" http://localhost:20061/ test-"$i" 2>&1
+   hg clone -r "$i" http://localhost:$HGPORT/ test-"$i" 2>&1
    if cd test-"$i"; then
       hg verify
       cd ..
    fi
 done
 cd test-8
 hg pull ../test-7
 hg verify
 cd ..
 cd test-1
-hg pull -r 4 http://localhost:20061/ 2>&1
+hg pull -r 4 http://localhost:$HGPORT/ 2>&1 | sed -e 's,:[0-9][0-9]*/,/,'
 hg verify
-hg pull http://localhost:20061/ 2>&1
+hg pull http://localhost:$HGPORT/ 2>&1 | sed -e 's,:[0-9][0-9]*/,/,'
 cd ..
 cd test-2
-hg pull -r 5 http://localhost:20061/ 2>&1
+hg pull -r 5 http://localhost:$HGPORT/ 2>&1 | sed -e 's,:[0-9][0-9]*/,/,'
 hg verify
-hg pull http://localhost:20061/ 2>&1
+hg pull http://localhost:$HGPORT/ 2>&1 | sed -e 's,:[0-9][0-9]*/,/,'
 hg verify
 cd ..

tests/test-http-clone-r.out

@@ -1,183 +1,183 b''
 # creating 'remote'
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 1 files updated, 0 files merged, 2 files removed, 0 files unresolved
    rev    offset  length   base linkrev nodeid       p1           p2
      0         0       3      0       0 362fef284ce2 000000000000 000000000000
      1         3       5      1       1 125144f7e028 362fef284ce2 000000000000
      2         8       7      2       2 4c982badb186 125144f7e028 000000000000
      3        15       9      3       3 19b1fc555737 4c982badb186 000000000000
    rev    offset  length   base linkrev nodeid       p1           p2
      0         0      75      0       7 905359268f77 000000000000 000000000000
    rev    offset  length   base linkrev nodeid       p1           p2
      0         0      75      0       8 905359268f77 000000000000 000000000000
    rev    offset  length   base linkrev nodeid       p1           p2
      0         0       8      0       6 12ab3bcc5ea4 000000000000 000000000000
    rev    offset  length   base linkrev nodeid       p1           p2
      0         0      48      0       0 43eadb1d2d06 000000000000 000000000000
      1        48      48      1       1 8b89697eba2c 43eadb1d2d06 000000000000
      2        96      48      2       2 626a32663c2f 8b89697eba2c 000000000000
      3       144      48      3       3 f54c32f13478 626a32663c2f 000000000000
      4       192      58      3       6 de68e904d169 626a32663c2f 000000000000
      5       250      68      3       7 3b45cc2ab868 de68e904d169 000000000000
      6       318      54      6       8 24d86153a002 f54c32f13478 000000000000
 checking changesets
 checking manifests
 crosschecking files in changesets and manifests
 checking files
 4 files, 9 changesets, 7 total revisions
 # Starting server
 # clone remote via stream
 requesting all changes
 adding changesets
 adding manifests
 adding file changes
 added 1 changesets with 1 changes to 1 files
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 checking changesets
 checking manifests
 crosschecking files in changesets and manifests
 checking files
 1 files, 1 changesets, 1 total revisions
 requesting all changes
 adding changesets
 adding manifests
 adding file changes
 added 2 changesets with 2 changes to 1 files
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 checking changesets
 checking manifests
 crosschecking files in changesets and manifests
 checking files
 1 files, 2 changesets, 2 total revisions
 requesting all changes
 adding changesets
 adding manifests
 adding file changes
 added 3 changesets with 3 changes to 1 files
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 checking changesets
 checking manifests
 crosschecking files in changesets and manifests
 checking files
 1 files, 3 changesets, 3 total revisions
 requesting all changes
 adding changesets
 adding manifests
 adding file changes
 added 4 changesets with 4 changes to 1 files
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 checking changesets
 checking manifests
 crosschecking files in changesets and manifests
 checking files
 1 files, 4 changesets, 4 total revisions
 requesting all changes
 adding changesets
 adding manifests
 adding file changes
 added 2 changesets with 2 changes to 1 files
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 checking changesets
 checking manifests
 crosschecking files in changesets and manifests
 checking files
 1 files, 2 changesets, 2 total revisions
 requesting all changes
 adding changesets
 adding manifests
 adding file changes
 added 3 changesets with 3 changes to 1 files
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 checking changesets
 checking manifests
 crosschecking files in changesets and manifests
 checking files
 1 files, 3 changesets, 3 total revisions
 requesting all changes
 adding changesets
 adding manifests
 adding file changes
 added 4 changesets with 5 changes to 2 files
 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
 checking changesets
 checking manifests
 crosschecking files in changesets and manifests
 checking files
 2 files, 4 changesets, 5 total revisions
 requesting all changes
 adding changesets
 adding manifests
 adding file changes
 added 5 changesets with 6 changes to 3 files
 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
 checking changesets
 checking manifests
 crosschecking files in changesets and manifests
 checking files
 3 files, 5 changesets, 6 total revisions
 requesting all changes
 adding changesets
 adding manifests
 adding file changes
 added 5 changesets with 5 changes to 2 files
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 checking changesets
 checking manifests
 crosschecking files in changesets and manifests
 checking files
 2 files, 5 changesets, 5 total revisions
 pulling from ../test-7
 searching for changes
 adding changesets
 adding manifests
 adding file changes
 added 4 changesets with 2 changes to 3 files (+1 heads)
 (run 'hg heads' to see heads, 'hg merge' to merge)
 checking changesets
 checking manifests
 crosschecking files in changesets and manifests
 checking files
 4 files, 9 changesets, 7 total revisions
-pulling from http://localhost:20061/
+pulling from http://localhost/
 searching for changes
 adding changesets
 adding manifests
 adding file changes
 added 1 changesets with 0 changes to 1 files (+1 heads)
 (run 'hg heads' to see heads, 'hg merge' to merge)
 checking changesets
 checking manifests
 crosschecking files in changesets and manifests
 checking files
 1 files, 3 changesets, 2 total revisions
-pulling from http://localhost:20061/
+pulling from http://localhost/
 searching for changes
 adding changesets
 adding manifests
 adding file changes
 added 6 changesets with 5 changes to 4 files
 (run 'hg update' to get a working copy)
-pulling from http://localhost:20061/
+pulling from http://localhost/
 searching for changes
 adding changesets
 adding manifests
 adding file changes
 added 2 changesets with 0 changes to 1 files (+1 heads)
 (run 'hg heads' to see heads, 'hg merge' to merge)
 checking changesets
 checking manifests
 crosschecking files in changesets and manifests
 checking files
 1 files, 5 changesets, 3 total revisions
-pulling from http://localhost:20061/
+pulling from http://localhost/
 searching for changes
 adding changesets
 adding manifests
 adding file changes
 added 4 changesets with 4 changes to 4 files
 (run 'hg update' to get a working copy)
 checking changesets
 checking manifests
 crosschecking files in changesets and manifests
 checking files
 4 files, 9 changesets, 7 total revisions

tests/test-http-proxy

@@ -1,41 +1,41 b''
 #!/bin/sh
 
 hg init a
 cd a
 echo a > a
 hg ci -Ama -d '1123456789 0'
-hg --config server.uncompressed=True serve -p 20059 -d --pid-file=hg.pid
+hg --config server.uncompressed=True serve -p $HGPORT -d --pid-file=hg.pid
 cat hg.pid >> $DAEMON_PIDS
 
 cd ..
-("$TESTDIR/tinyproxy.py" 20060 localhost >proxy.log 2>&1 </dev/null &
+("$TESTDIR/tinyproxy.py" $HGPORT1 localhost >proxy.log 2>&1 </dev/null &
 echo $! > proxy.pid)
 cat proxy.pid >> $DAEMON_PIDS
 sleep 2
 
 echo %% url for proxy, stream
-http_proxy=http://localhost:20060/ hg --config http_proxy.always=True clone --uncompressed http://localhost:20059/ b | \
+http_proxy=http://localhost:$HGPORT1/ hg --config http_proxy.always=True clone --uncompressed http://localhost:$HGPORT/ b | \
   sed -e 's/[0-9][0-9.]*/XXX/g' -e 's/[KM]\(B\/sec\)/X\1/'
 cd b
 hg verify
 cd ..
 
 echo %% url for proxy, pull
-http_proxy=http://localhost:20060/ hg --config http_proxy.always=True clone http://localhost:20059/ b-pull
+http_proxy=http://localhost:$HGPORT1/ hg --config http_proxy.always=True clone http://localhost:$HGPORT/ b-pull
 cd b-pull
 hg verify
 cd ..
 
 echo %% host:port for proxy
-http_proxy=localhost:20060 hg clone --config http_proxy.always=True http://localhost:20059/ c
+http_proxy=localhost:$HGPORT1 hg clone --config http_proxy.always=True http://localhost:$HGPORT/ c
 
 echo %% proxy url with user name and password
-http_proxy=http://user:passwd@localhost:20060 hg clone --config http_proxy.always=True http://localhost:20059/ d
+http_proxy=http://user:passwd@localhost:$HGPORT1 hg clone --config http_proxy.always=True http://localhost:$HGPORT/ d
 
 echo %% url with user name and password
-http_proxy=http://user:passwd@localhost:20060 hg clone --config http_proxy.always=True http://user:passwd@localhost:20059/ e
+http_proxy=http://user:passwd@localhost:$HGPORT1 hg clone --config http_proxy.always=True http://user:passwd@localhost:$HGPORT/ e
 
 echo %% bad host:port for proxy
-http_proxy=localhost:20061 hg clone --config http_proxy.always=True http://localhost:20059/ f
+http_proxy=localhost:$HGPORT2 hg clone --config http_proxy.always=True http://localhost:$HGPORT/ f
 
 exit 0

tests/test-http.out

@@ -1,41 +1,41 b''
 adding foo
 abort: cannot start server:
 % clone via stream
 streaming all changes
 XXX files to transfer, XXX bytes of data
 transferred XXX bytes in XXX seconds (XXX XB/sec)
 XXX files updated, XXX files merged, XXX files removed, XXX files unresolved
 checking changesets
 checking manifests
 crosschecking files in changesets and manifests
 checking files
 1 files, 1 changesets, 1 total revisions
 % try to clone via stream, should use pull instead
 requesting all changes
 adding changesets
 adding manifests
 adding file changes
 added 1 changesets with 1 changes to 1 files
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 % clone via pull
 requesting all changes
 adding changesets
 adding manifests
 adding file changes
 added 1 changesets with 1 changes to 1 files
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 checking changesets
 checking manifests
 crosschecking files in changesets and manifests
 checking files
 1 files, 1 changesets, 1 total revisions
 adding bar
 % pull
-changegroup hook: HG_NODE=cfbd11a1fa315300a080c3de8fe36b0fc5820acf HG_SOURCE=pull HG_URL=http://localhost:20059/ 
-pulling from http://localhost:20059/
+changegroup hook: HG_NODE=cfbd11a1fa315300a080c3de8fe36b0fc5820acf HG_SOURCE=pull HG_URL=http://localhost/ 
+pulling from http://localhost/
 searching for changes
 adding changesets
 adding manifests
 adding file changes
 added 1 changesets with 1 changes to 1 files
 (run 'hg update' to get a working copy)

tests/test-incoming-outgoing

@@ -1,48 +1,48 b''
 #!/bin/sh
 
 mkdir test
 cd test
 hg init
 for i in 0 1 2 3 4 5 6 7 8; do
 	echo $i >> foo
 	hg commit -A -m $i -d "1000000 0"
 done
 hg verify
-hg serve -p 20059 -d --pid-file=hg.pid
+hg serve -p $HGPORT -d --pid-file=hg.pid
 cat hg.pid >> $DAEMON_PIDS
 cd ..
 
 hg init new
 # http incoming
-http_proxy= hg -R new incoming http://localhost:20059/
-http_proxy= hg -R new incoming -r 4 http://localhost:20059/
+http_proxy= hg -R new incoming http://localhost:$HGPORT/ | sed -e 's,:[0-9][0-9]*/,/,'
+http_proxy= hg -R new incoming -r 4 http://localhost:$HGPORT/ | sed -e 's,:[0-9][0-9]*/,/,'
 # local incoming
 hg -R new incoming test
 hg -R new incoming -r 4 test
 
 # test with --bundle
-http_proxy= hg -R new incoming --bundle test.hg http://localhost:20059/
+http_proxy= hg -R new incoming --bundle test.hg http://localhost:$HGPORT/ | sed -e 's,:[0-9][0-9]*/,/,'
 hg -R new incoming --bundle test2.hg test
 
 # test the resulting bundles
 hg init temp
 hg init temp2
 hg -R temp unbundle test.hg
 hg -R temp2 unbundle test2.hg
 hg -R temp tip
 hg -R temp2 tip
 
 rm -r temp temp2 new
 
 # test outgoing
 hg clone test test-dev
 cd test-dev
 for i in 9 10 11 12 13; do
 	echo $i >> foo
 	hg commit -A -m $i -d "1000000 0"
 done
 hg verify
 cd ..
 hg -R test-dev outgoing test
-http_proxy= hg -R test-dev outgoing http://localhost:20059/
-http_proxy= hg -R test-dev outgoing -r 11 http://localhost:20059/
+http_proxy= hg -R test-dev outgoing http://localhost:$HGPORT/ | sed -e 's,:[0-9][0-9]*/,/,'
+http_proxy= hg -R test-dev outgoing -r 11 http://localhost:$HGPORT/ | sed -e 's,:[0-9][0-9]*/,/,'

tests/test-incoming-outgoing.out

@@ -1,348 +1,348 b''
 adding foo
 checking changesets
 checking manifests
 crosschecking files in changesets and manifests
 checking files
 1 files, 9 changesets, 9 total revisions
-comparing with http://localhost:20059/
+comparing with http://localhost/
 changeset:   0:9cb21d99fe27
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     0
 
 changeset:   1:d717f5dfad6a
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     1
 
 changeset:   2:c0d6b86da426
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     2
 
 changeset:   3:dfacbd43b3fe
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     3
 
 changeset:   4:1f3a964b6022
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     4
 
 changeset:   5:c028bcc7a28a
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     5
 
 changeset:   6:a0c0095f3389
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     6
 
 changeset:   7:d4be65f4e891
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     7
 
 changeset:   8:92b83e334ef8
 tag:         tip
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     8
 
-comparing with http://localhost:20059/
+comparing with http://localhost/
 changeset:   0:9cb21d99fe27
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     0
 
 changeset:   1:d717f5dfad6a
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     1
 
 changeset:   2:c0d6b86da426
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     2
 
 changeset:   3:dfacbd43b3fe
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     3
 
 changeset:   4:1f3a964b6022
 tag:         tip
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     4
 
 comparing with test
 changeset:   0:9cb21d99fe27
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     0
 
 changeset:   1:d717f5dfad6a
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     1
 
 changeset:   2:c0d6b86da426
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     2
 
 changeset:   3:dfacbd43b3fe
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     3
 
 changeset:   4:1f3a964b6022
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     4
 
 changeset:   5:c028bcc7a28a
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     5
 
 changeset:   6:a0c0095f3389
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     6
 
 changeset:   7:d4be65f4e891
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     7
 
 changeset:   8:92b83e334ef8
 tag:         tip
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     8
 
 comparing with test
 changeset:   0:9cb21d99fe27
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     0
 
 changeset:   1:d717f5dfad6a
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     1
 
 changeset:   2:c0d6b86da426
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     2
 
 changeset:   3:dfacbd43b3fe
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     3
 
 changeset:   4:1f3a964b6022
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     4
 
-comparing with http://localhost:20059/
+comparing with http://localhost/
 changeset:   0:9cb21d99fe27
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     0
 
 changeset:   1:d717f5dfad6a
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     1
 
 changeset:   2:c0d6b86da426
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     2
 
 changeset:   3:dfacbd43b3fe
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     3
 
 changeset:   4:1f3a964b6022
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     4
 
 changeset:   5:c028bcc7a28a
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     5
 
 changeset:   6:a0c0095f3389
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     6
 
 changeset:   7:d4be65f4e891
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     7
 
 changeset:   8:92b83e334ef8
 tag:         tip
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     8
 
 comparing with test
 changeset:   0:9cb21d99fe27
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     0
 
 changeset:   1:d717f5dfad6a
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     1
 
 changeset:   2:c0d6b86da426
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     2
 
 changeset:   3:dfacbd43b3fe
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     3
 
 changeset:   4:1f3a964b6022
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     4
 
 changeset:   5:c028bcc7a28a
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     5
 
 changeset:   6:a0c0095f3389
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     6
 
 changeset:   7:d4be65f4e891
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     7
 
 changeset:   8:92b83e334ef8
 tag:         tip
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     8
 
 adding changesets
 adding manifests
 adding file changes
 added 9 changesets with 9 changes to 1 files
 (run 'hg update' to get a working copy)
 adding changesets
 adding manifests
 adding file changes
 added 9 changesets with 9 changes to 1 files
 (run 'hg update' to get a working copy)
 changeset:   8:92b83e334ef8
 tag:         tip
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     8
 
 changeset:   8:92b83e334ef8
 tag:         tip
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     8
 
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 checking changesets
 checking manifests
 crosschecking files in changesets and manifests
 checking files
 1 files, 14 changesets, 14 total revisions
 comparing with test
 searching for changes
 changeset:   9:3741c3ad1096
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     9
 
 changeset:   10:de4143c8d9a5
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     10
 
 changeset:   11:0e1c188b9a7a
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     11
 
 changeset:   12:251354d0fdd3
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     12
 
 changeset:   13:bdaadd969642
 tag:         tip
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     13
 
-comparing with http://localhost:20059/
+comparing with http://localhost/
 searching for changes
 changeset:   9:3741c3ad1096
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     9
 
 changeset:   10:de4143c8d9a5
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     10
 
 changeset:   11:0e1c188b9a7a
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     11
 
 changeset:   12:251354d0fdd3
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     12
 
 changeset:   13:bdaadd969642
 tag:         tip
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     13
 
-comparing with http://localhost:20059/
+comparing with http://localhost/
 searching for changes
 changeset:   9:3741c3ad1096
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     9
 
 changeset:   10:de4143c8d9a5
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     10
 
 changeset:   11:0e1c188b9a7a
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     11
 

tests/test-non-interactive-wsgi

@@ -1,70 +1,70 b''
 #!/bin/sh
 
 mkdir repo
 cd repo
 hg init
 echo foo > bar
 hg add bar
 hg commit -m "test" -d "0 0"
 hg tip
 
 cat > request.py <<EOF
 from mercurial import dispatch
 from mercurial.hgweb.hgweb_mod import hgweb
 from mercurial.hgweb.request import _wsgirequest
 from mercurial.ui import ui
 from mercurial import hg
 from StringIO import StringIO
-import sys
+import os, sys
 
 class FileLike(object):
     def __init__(self, real):
         self.real = real
     def fileno(self):
         print >> sys.__stdout__, 'FILENO'
         return self.real.fileno()
     def read(self):
         print >> sys.__stdout__, 'READ'
         return self.real.read()
     def readline(self):
         print >> sys.__stdout__, 'READLINE'
         return self.real.readline()
     def isatty(self):
         print >> sys.__stdout__, 'ISATTY'
         return False
 
 sys.stdin = FileLike(sys.stdin)
 errors = StringIO()
 input = StringIO()
 output = StringIO()
 
 def startrsp(headers, data):
 	print '---- HEADERS'
 	print headers
 	print '---- DATA'
 	print data
 	return output.write
 
 env = {
 	'wsgi.version': (1, 0),
 	'wsgi.url_scheme': 'http',
 	'wsgi.errors': errors,
 	'wsgi.input': input,
 	'wsgi.multithread': False,
 	'wsgi.multiprocess': False,
 	'wsgi.run_once': False,
 	'REQUEST_METHOD': 'GET',
 	'SCRIPT_NAME': '',
 	'PATH_INFO': '',
 	'QUERY_STRING': '',
 	'SERVER_NAME': '127.0.0.1',
-	'SERVER_PORT': '20059',
+	'SERVER_PORT': os.environ['HGPORT'],
 	'SERVER_PROTOCOL': 'HTTP/1.0'
 }
 
 _wsgirequest(hgweb('.'), env, startrsp)
 print '---- ERRORS'
 print errors.getvalue()
 EOF
 
 python request.py

tests/test-pull

@@ -1,26 +1,26 b''
 #!/bin/sh
 
 mkdir test
 cd test
 echo foo>foo
 hg init
 hg addremove
 hg commit -m 1
 hg verify
-hg serve -p 20059 -d --pid-file=hg.pid
+hg serve -p $HGPORT -d --pid-file=hg.pid
 cat hg.pid >> $DAEMON_PIDS
 cd ..
 
-http_proxy= hg clone --pull http://localhost:20059/ copy
+http_proxy= hg clone --pull http://localhost:$HGPORT/ copy | sed -e 's,:[0-9][0-9]*/,/,'
 cd copy
 hg verify
 hg co
 cat foo
 hg manifest --debug
-hg pull
+hg pull | sed -e 's,:[0-9][0-9]*/,/,'
 
 echo % issue 622
 cd ..
 hg init empty
 cd empty
 hg pull -u ../test

tests/test-pull.out

@@ -1,31 +1,31 b''
 adding foo
 checking changesets
 checking manifests
 crosschecking files in changesets and manifests
 checking files
 1 files, 1 changesets, 1 total revisions
 requesting all changes
 adding changesets
 adding manifests
 adding file changes
 added 1 changesets with 1 changes to 1 files
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 checking changesets
 checking manifests
 crosschecking files in changesets and manifests
 checking files
 1 files, 1 changesets, 1 total revisions
 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 foo
 2ed2a3912a0b24502043eae84ee4b279c18b90dd 644 foo
-pulling from http://localhost:20059/
+pulling from http://localhost/
 searching for changes
 no changes found
 % issue 622
 pulling from ../test
 requesting all changes
 adding changesets
 adding manifests
 adding file changes
 added 1 changesets with 1 changes to 1 files
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved

tests/test-push-http

@@ -1,65 +1,65 b''
 #!/bin/sh
 
 cp "$TESTDIR"/printenv.py .
 
 hg init test
 cd test
 echo a > a
 hg ci -Ama -d '0 0'
 
 cd ..
 hg clone test test2
 cd test2
 echo a >> a
 hg ci -mb -d '0 0'
 
 cd ../test
 
 echo % expect ssl error
-hg serve -p 20059 -d --pid-file=hg.pid
+hg serve -p $HGPORT -d --pid-file=hg.pid
 cat hg.pid >> $DAEMON_PIDS
-hg --cwd ../test2 push http://localhost:20059/
+hg --cwd ../test2 push http://localhost:$HGPORT/
 kill `cat hg.pid`
 
 echo % expect authorization error
 echo '[web]' > .hg/hgrc
 echo 'push_ssl = false' >> .hg/hgrc
-hg serve -p 20059 -d --pid-file=hg.pid
+hg serve -p $HGPORT -d --pid-file=hg.pid
 cat hg.pid >> $DAEMON_PIDS
-hg --cwd ../test2 push http://localhost:20059/
+hg --cwd ../test2 push http://localhost:$HGPORT/
 kill `cat hg.pid`
 
 echo % expect authorization error: must have authorized user
 echo 'allow_push = unperson' >> .hg/hgrc
-hg serve -p 20059 -d --pid-file=hg.pid
+hg serve -p $HGPORT -d --pid-file=hg.pid
 cat hg.pid >> $DAEMON_PIDS
-hg --cwd ../test2 push http://localhost:20059/
+hg --cwd ../test2 push http://localhost:$HGPORT/
 kill `cat hg.pid`
 
 echo % expect success
 echo 'allow_push = *' >> .hg/hgrc
 echo '[hooks]' >> .hg/hgrc
 echo 'changegroup = python ../printenv.py changegroup 0 ../urls' >> .hg/hgrc
-hg serve -p 20059 -d --pid-file=hg.pid
+hg serve -p $HGPORT -d --pid-file=hg.pid
 cat hg.pid >> $DAEMON_PIDS
-hg --cwd ../test2 push http://localhost:20059/
+hg --cwd ../test2 push http://localhost:$HGPORT/
 kill `cat hg.pid`
 hg rollback
 
 cat ../urls
 
 echo % expect authorization error: all users denied
 echo '[web]' > .hg/hgrc
 echo 'push_ssl = false' >> .hg/hgrc
 echo 'deny_push = *' >> .hg/hgrc
-hg serve -p 20059 -d --pid-file=hg.pid
+hg serve -p $HGPORT -d --pid-file=hg.pid
 cat hg.pid >> $DAEMON_PIDS
-hg --cwd ../test2 push http://localhost:20059/
+hg --cwd ../test2 push http://localhost:$HGPORT/ | sed -e 's,:[0-9][0-9]*/,/,'
 kill `cat hg.pid`
 
 echo % expect authorization error: some users denied, users must be authenticated
 echo 'deny_push = unperson' >> .hg/hgrc
-hg serve -p 20059 -d --pid-file=hg.pid
+hg serve -p $HGPORT -d --pid-file=hg.pid
 cat hg.pid >> $DAEMON_PIDS
-hg --cwd ../test2 push http://localhost:20059/
+hg --cwd ../test2 push http://localhost:$HGPORT/ | sed -e 's,:[0-9][0-9]*/,/,'
 kill `cat hg.pid`

tests/test-push-http.out

@@ -1,31 +1,31 b''
 adding a
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 % expect ssl error
-pushing to http://localhost:20059/
+pushing to http://localhost:23451/
 searching for changes
 ssl required
 % expect authorization error
-pushing to http://localhost:20059/
+pushing to http://localhost:23451/
 searching for changes
 push not authorized
 % expect authorization error: must have authorized user
-pushing to http://localhost:20059/
+pushing to http://localhost:23451/
 searching for changes
 push not authorized
 % expect success
-pushing to http://localhost:20059/
+pushing to http://localhost:23451/
 searching for changes
 adding changesets
 adding manifests
 adding file changes
 added 1 changesets with 1 changes to 1 files
 rolling back last transaction
 changegroup hook: HG_NODE=ba677d0156c1196c1a699fa53f390dcfc3ce3872 HG_SOURCE=serve HG_URL=remote:http 
 % expect authorization error: all users denied
-pushing to http://localhost:20059/
+pushing to http://localhost/
 searching for changes
 push not authorized
 % expect authorization error: some users denied, users must be authenticated
-pushing to http://localhost:20059/
+pushing to http://localhost/
 searching for changes
 push not authorized

tests/test-serve

@@ -1,18 +1,18 b''
 #!/bin/sh
 
 hg init test
 cd test
 
 echo '[web]' > .hg/hgrc
 echo 'accesslog = access.log' >> .hg/hgrc
 
 echo % Without -v
-hg serve -a localhost -p 20063 -d --pid-file=hg.pid
+hg serve -a localhost -p $HGPORT -d --pid-file=hg.pid
 cat hg.pid >> "$DAEMON_PIDS"
 if [ -f access.log ]; then
     echo 'access log created - .hg/hgrc respected'
 fi
 
 echo % With -v
-hg serve -a localhost -p 20064 -d --pid-file=hg.pid -v
+hg serve -a localhost -p $HGPORT1 -d --pid-file=hg.pid -v | sed -e 's,:[0-9][0-9]*/,/,'
 cat hg.pid >> "$DAEMON_PIDS"

tests/test-serve.out

@@ -1,4 +1,4 b''
 % Without -v
 access log created - .hg/hgrc respected
 % With -v
-listening at http://localhost:20064/
+listening at http://localhost/

tests/test-static-http

@@ -1,66 +1,66 b''
 #!/bin/sh
 
 cp "$TESTDIR"/printenv.py .
 
-http_proxy= hg clone static-http://localhost:20059/ copy
+http_proxy= hg clone static-http://localhost:$HGPORT/ copy
 echo $?
 test -d copy || echo copy: No such file or directory
 
 # This server doesn't do range requests so it's basically only good for
 # one pull
 cat > dumb.py <<EOF
-import BaseHTTPServer, SimpleHTTPServer, signal
+import BaseHTTPServer, SimpleHTTPServer, os, signal
 
 def run(server_class=BaseHTTPServer.HTTPServer,
         handler_class=SimpleHTTPServer.SimpleHTTPRequestHandler):
-    server_address = ('localhost', 20059)
+    server_address = ('localhost', int(os.environ['HGPORT']))
     httpd = server_class(server_address, handler_class)
     httpd.serve_forever()
 
 signal.signal(signal.SIGTERM, lambda x: sys.exit(0))
 run()
 EOF
 
 python dumb.py 2>/dev/null &
 echo $! >> $DAEMON_PIDS
 
 mkdir remote
 cd remote
 hg init
 echo foo > bar
 hg add bar
 hg commit -m"test" -d "1000000 0"
 hg tip
 
 cd ..
 
-http_proxy= hg clone static-http://localhost:20059/remote local
+http_proxy= hg clone static-http://localhost:$HGPORT/remote local | sed -e 's,:[0-9][0-9]*/,/,'
 
 cd local
 hg verify
 cat bar
 
 cd ../remote
 echo baz > quux
 hg commit -A -mtest2 -d '100000000 0'
 
 cd ../local
 echo '[hooks]' >> .hg/hgrc
 echo 'changegroup = python ../printenv.py changegroup' >> .hg/hgrc
-http_proxy= hg pull
+http_proxy= hg pull | sed -e 's,:[0-9][0-9]*/,/,'
 
 echo '% test with "/" URI (issue 747)'
 cd ..
 hg init
 echo a > a
 hg add a
 hg ci -ma
 
-http_proxy= hg clone static-http://localhost:20059/ local2
+http_proxy= hg clone static-http://localhost:$HGPORT/ local2 | sed -e 's,:[0-9][0-9]*/,/,'
 
 cd local2
 hg verify
 cat a
-hg paths
+hg paths | sed -e 's,:[0-9][0-9]*/,/,'
 
 kill $!

tests/test-static-http.out

@@ -1,44 +1,44 b''
 abort: Connection refused
 255
 copy: No such file or directory
 changeset:   0:53e17d176ae6
 tag:         tip
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     test
 
 requesting all changes
 adding changesets
 adding manifests
 adding file changes
 added 1 changesets with 1 changes to 1 files
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 checking changesets
 checking manifests
 crosschecking files in changesets and manifests
 checking files
 1 files, 1 changesets, 1 total revisions
 foo
 adding quux
-changegroup hook: HG_NODE=34401e0e9971e9720b613d9089ffa9a6eefb3d2d HG_SOURCE=pull HG_URL=static-http://localhost:20059/remote 
-pulling from static-http://localhost:20059/remote
+changegroup hook: HG_NODE=34401e0e9971e9720b613d9089ffa9a6eefb3d2d HG_SOURCE=pull HG_URL=static-http://localhost/remote 
+pulling from static-http://localhost/remote
 searching for changes
 adding changesets
 adding manifests
 adding file changes
 added 1 changesets with 1 changes to 1 files
 (run 'hg update' to get a working copy)
 % test with "/" URI (issue 747)
 requesting all changes
 adding changesets
 adding manifests
 adding file changes
 added 1 changesets with 1 changes to 1 files
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 checking changesets
 checking manifests
 crosschecking files in changesets and manifests
 checking files
 1 files, 1 changesets, 1 total revisions
 a
-default = static-http://localhost:20059/
+default = static-http://localhost/

tests/test-transplant

@@ -1,98 +1,98 b''
 #!/bin/sh
 
 cat <<EOF >> $HGRCPATH
 [extensions]
 transplant=
 EOF
 
 hg init t
 cd t
 echo r1 > r1
 hg ci -Amr1 -d'0 0'
 echo r2 > r2
 hg ci -Amr2 -d'1 0'
 hg up 0
 
 echo b1 > b1
 hg ci -Amb1 -d '0 0'
 echo b2 > b2
 hg ci -Amb2 -d '1 0'
 echo b3 > b3
 hg ci -Amb3 -d '2 0'
 
 hg log --template '{rev} {parents} {desc}\n'
 
 hg clone . ../rebase
 cd ../rebase
 
 hg up -C 1
 echo '% rebase b onto r1'
 hg transplant -a -b tip
 hg log --template '{rev} {parents} {desc}\n'
 
 hg clone ../t ../prune
 cd ../prune
 
 hg up -C 1
 echo '% rebase b onto r1, skipping b2'
 hg transplant -a -b tip -p 3
 hg log --template '{rev} {parents} {desc}\n'
 
 echo '% remote transplant'
 hg clone -r 1 ../t ../remote
 cd ../remote
 hg transplant --log -s ../t 2 4
 hg log --template '{rev} {parents} {desc}\n'
 
 echo '% skip previous transplants'
 hg transplant -s ../t -a -b 4
 hg log --template '{rev} {parents} {desc}\n'
 
 echo '% skip local changes transplanted to the source'
 echo b4 > b4
 hg ci -Amb4 -d '3 0'
 hg clone ../t ../pullback
 cd ../pullback
 hg transplant -s ../remote -a -b tip
 
 echo '% remote transplant with pull'
-hg -R ../t serve -p 20062 -d --pid-file=../t.pid
+hg -R ../t serve -p $HGPORT -d --pid-file=../t.pid
 cat ../t.pid >> $DAEMON_PIDS
 
 hg clone -r 0 ../t ../rp
 cd ../rp
-hg transplant -s http://localhost:20062/ 2 4
+hg transplant -s http://localhost:$HGPORT/ 2 4
 hg log --template '{rev} {parents} {desc}\n'
 
 echo '% transplant --continue'
 hg init ../tc
 cd ../tc
 cat <<EOF > foo
 foo
 bar
 baz
 EOF
 echo toremove > toremove
 hg ci -Amfoo -d '0 0'
 cat <<EOF > foo
 foo2
 bar2
 baz2
 EOF
 rm toremove
 echo added > added
 hg ci -Amfoo2 -d '0 0'
 echo bar > bar
 hg ci -Ambar -d '0 0'
 echo bar2 >> bar
 hg ci -mbar2 -d '0 0'
 hg up 0
 echo foobar > foo
 hg ci -mfoobar -d '0 0'
 hg transplant 1:3
 # transplant -c shouldn't use an old changeset
 hg up -C
 hg transplant 1
 hg transplant --continue
 hg transplant 1:3
 hg locate

tests/test-webraw

@@ -1,22 +1,22 b''
 #!/bin/sh
 
 hg init test
 cd test
 cat >sometext.txt <<ENDSOME
 This is just some random text
 that will go inside the file and take a few lines.
 It is very boring to read, but computers don't
 care about things like that.
 ENDSOME
 hg add sometext.txt
 hg commit -d "1 0" -m "Just some text"
-hg serve -p 20059 -A access.log -E error.log -d --pid-file=hg.pid
+hg serve -p $HGPORT -A access.log -E error.log -d --pid-file=hg.pid
 cat hg.pid >> $DAEMON_PIDS
-("$TESTDIR/get-with-headers.py" localhost:20059 '/?f=f165dc289438;file=sometext.txt;style=raw' content-type content-length content-disposition) >getoutput.txt &
+("$TESTDIR/get-with-headers.py" localhost:$HGPORT '/?f=f165dc289438;file=sometext.txt;style=raw' content-type content-length content-disposition) >getoutput.txt &
 
 sleep 5
 kill `cat hg.pid`
 sleep 1 # wait for server to scream and die
 cat getoutput.txt
 cat access.log error.log | \
   sed 's/^[^ ]*\( [^[]*\[\)[^]]*\(\].*\)$/host\1date\2/'