tests: reintroduce ":$HGPORT" in test output

tests: reintroduce ":$HGPORT" in test output

This reduces the number of patterns that must be adjusted when writing tests.

--- a/tests/run-tests.py	Fri Oct 08 22:36:11 2010 -0500
+++ b/tests/run-tests.py	Fri Oct 08 22:36:11 2010 -0500
@@ -691,7 +691,12 @@
     if options.timeout > 0:
         signal.alarm(options.timeout)
 
-    ret, out = runner(testpath, options, [(testtmp, '$TESTTMP')])
+    ret, out = runner(testpath, options, [
+        (testtmp, '$TESTTMP'),
+        (':%s' % options.port, ':$HGPORT'),
+        (':%s' % (options.port + 1), ':$HGPORT1'),
+        (':%s' % (options.port + 2), ':$HGPORT2'),
+        ])
     vlog("# Ret was:", ret)
 
     if options.timeout > 0:

--- a/tests/test-fetch.t	Fri Oct 08 22:36:11 2010 -0500
+++ b/tests/test-fetch.t	Fri Oct 08 22:36:11 2010 -0500
@@ -72,7 +72,7 @@
 fetch over http, no auth
 
   $ hg --cwd d fetch -d '5 0' http://localhost:$HGPORT/
-  pulling from http://localhost:*/ (glob)
+  pulling from http://localhost:$HGPORT/
   searching for changes
   adding changesets
   adding manifests
@@ -84,12 +84,12 @@
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   new changeset 3:* merges remote changes with local (glob)
   $ hg --cwd d tip --template '{desc}\n'
-  Automated merge with http://localhost:*/ (glob)
+  Automated merge with http://localhost:$HGPORT/
 
 fetch over http with auth (should be hidden in desc)
 
   $ hg --cwd e fetch -d '5 0' http://user:password@localhost:$HGPORT/
-  pulling from http://user:***@localhost:*/ (glob)
+  pulling from http://user:***@localhost:$HGPORT/
   searching for changes
   adding changesets
   adding manifests
@@ -101,7 +101,7 @@
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   new changeset 3:* merges remote changes with local (glob)
   $ hg --cwd e tip --template '{desc}\n'
-  Automated merge with http://localhost:*/ (glob)
+  Automated merge with http://localhost:$HGPORT/
   $ hg clone a f
   updating to branch default
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved

--- a/tests/test-hgweb-commands.t	Fri Oct 08 22:36:11 2010 -0500
+++ b/tests/test-hgweb-commands.t	Fri Oct 08 22:36:11 2010 -0500
@@ -30,16 +30,16 @@
   <?xml version="1.0" encoding="ascii"?>
   <feed xmlns="http://www.w3.org/2005/Atom">
    <!-- Changelog -->
-   <id>http://*/</id> (glob)
-   <link rel="self" href="http://*/atom-log"/> (glob)
-   <link rel="alternate" href="http://*/"/> (glob)
+   <id>http://*:$HGPORT/</id> (glob)
+   <link rel="self" href="http://*:$HGPORT/atom-log"/> (glob)
+   <link rel="alternate" href="http://*:$HGPORT/"/> (glob)
    <title>test Changelog</title>
    <updated>1970-01-01T00:00:00+00:00</updated>
   
    <entry>
     <title>branch</title>
-    <id>http://*/#changeset-1d22e65f027e5a0609357e7d8e7508cd2ba5d2fe</id> (glob)
-    <link href="http://*/rev/1d22e65f027e"/> (glob)
+    <id>http://*:$HGPORT/#changeset-1d22e65f027e5a0609357e7d8e7508cd2ba5d2fe</id> (glob)
+    <link href="http://*:$HGPORT/rev/1d22e65f027e"/> (glob)
     <author>
      <name>test</name>
      <email>&#116;&#101;&#115;&#116;</email>
@@ -54,8 +54,8 @@
    </entry>
    <entry>
     <title>Added tag 1.0 for changeset 2ef0ac749a14</title>
-    <id>http://*/#changeset-a4f92ed23982be056b9852de5dfe873eaac7f0de</id> (glob)
-    <link href="http://*/rev/a4f92ed23982"/> (glob)
+    <id>http://*:$HGPORT/#changeset-a4f92ed23982be056b9852de5dfe873eaac7f0de</id> (glob)
+    <link href="http://*:$HGPORT/rev/a4f92ed23982"/> (glob)
     <author>
      <name>test</name>
      <email>&#116;&#101;&#115;&#116;</email>
@@ -70,8 +70,8 @@
    </entry>
    <entry>
     <title>base</title>
-    <id>http://*/#changeset-2ef0ac749a14e4f57a5a822464a0902c6f7f448f</id> (glob)
-    <link href="http://*/rev/2ef0ac749a14"/> (glob)
+    <id>http://*:$HGPORT/#changeset-2ef0ac749a14e4f57a5a822464a0902c6f7f448f</id> (glob)
+    <link href="http://*:$HGPORT/rev/2ef0ac749a14"/> (glob)
     <author>
      <name>test</name>
      <email>&#116;&#101;&#115;&#116;</email>
@@ -92,16 +92,16 @@
   <?xml version="1.0" encoding="ascii"?>
   <feed xmlns="http://www.w3.org/2005/Atom">
    <!-- Changelog -->
-   <id>http://*/</id> (glob)
-   <link rel="self" href="http://*/atom-log"/> (glob)
-   <link rel="alternate" href="http://*/"/> (glob)
+   <id>http://*:$HGPORT/</id> (glob)
+   <link rel="self" href="http://*:$HGPORT/atom-log"/> (glob)
+   <link rel="alternate" href="http://*:$HGPORT/"/> (glob)
    <title>test Changelog</title>
    <updated>1970-01-01T00:00:00+00:00</updated>
   
    <entry>
     <title>branch</title>
-    <id>http://*/#changeset-1d22e65f027e5a0609357e7d8e7508cd2ba5d2fe</id> (glob)
-    <link href="http://*/rev/1d22e65f027e"/> (glob)
+    <id>http://*:$HGPORT/#changeset-1d22e65f027e5a0609357e7d8e7508cd2ba5d2fe</id> (glob)
+    <link href="http://*:$HGPORT/rev/1d22e65f027e"/> (glob)
     <author>
      <name>test</name>
      <email>&#116;&#101;&#115;&#116;</email>
@@ -116,8 +116,8 @@
    </entry>
    <entry>
     <title>Added tag 1.0 for changeset 2ef0ac749a14</title>
-    <id>http://*/#changeset-a4f92ed23982be056b9852de5dfe873eaac7f0de</id> (glob)
-    <link href="http://*/rev/a4f92ed23982"/> (glob)
+    <id>http://*:$HGPORT/#changeset-a4f92ed23982be056b9852de5dfe873eaac7f0de</id> (glob)
+    <link href="http://*:$HGPORT/rev/a4f92ed23982"/> (glob)
     <author>
      <name>test</name>
      <email>&#116;&#101;&#115;&#116;</email>
@@ -132,8 +132,8 @@
    </entry>
    <entry>
     <title>base</title>
-    <id>http://*/#changeset-2ef0ac749a14e4f57a5a822464a0902c6f7f448f</id> (glob)
-    <link href="http://*/rev/2ef0ac749a14"/> (glob)
+    <id>http://*:$HGPORT/#changeset-2ef0ac749a14e4f57a5a822464a0902c6f7f448f</id> (glob)
+    <link href="http://*:$HGPORT/rev/2ef0ac749a14"/> (glob)
     <author>
      <name>test</name>
      <email>&#116;&#101;&#115;&#116;</email>
@@ -153,15 +153,15 @@
   
   <?xml version="1.0" encoding="ascii"?>
   <feed xmlns="http://www.w3.org/2005/Atom">
-   <id>http://*/atom-log/tip/foo</id> (glob)
-   <link rel="self" href="http://*/atom-log/tip/foo"/> (glob)
+   <id>http://*:$HGPORT/atom-log/tip/foo</id> (glob)
+   <link rel="self" href="http://*:$HGPORT/atom-log/tip/foo"/> (glob)
    <title>test: foo history</title>
    <updated>1970-01-01T00:00:00+00:00</updated>
   
    <entry>
     <title>base</title>
-    <id>http://*/#changeset-2ef0ac749a14e4f57a5a822464a0902c6f7f448f</id> (glob)
-    <link href="http://*/rev/2ef0ac749a14"/> (glob)
+    <id>http://*:$HGPORT/#changeset-2ef0ac749a14e4f57a5a822464a0902c6f7f448f</id> (glob)
+    <link href="http://*:$HGPORT/rev/2ef0ac749a14"/> (glob)
     <author>
      <name>test</name>
      <email>&#116;&#101;&#115;&#116;</email>

--- a/tests/test-hgweb-no-path-info.t	Fri Oct 08 22:36:11 2010 -0500
+++ b/tests/test-hgweb-no-path-info.t	Fri Oct 08 22:36:11 2010 -0500
@@ -70,16 +70,16 @@
   <?xml version="1.0" encoding="ascii"?>
   <feed xmlns="http://www.w3.org/2005/Atom">
    <!-- Changelog -->
-   <id>http://127.0.0.1:*/</id> (glob)
-   <link rel="self" href="http://127.0.0.1:*/atom-log"/> (glob)
-   <link rel="alternate" href="http://127.0.0.1:*/"/> (glob)
+   <id>http://127.0.0.1:$HGPORT/</id>
+   <link rel="self" href="http://127.0.0.1:$HGPORT/atom-log"/>
+   <link rel="alternate" href="http://127.0.0.1:$HGPORT/"/>
    <title>repo Changelog</title>
    <updated>1970-01-01T00:00:00+00:00</updated>
   
    <entry>
     <title>test</title>
-    <id>http://127.0.0.1:*/#changeset-61c9426e69fef294feed5e2bbfc97d39944a5b1c</id> (glob)
-    <link href="http://127.0.0.1:*/rev/61c9426e69fe"/> (glob)
+    <id>http://127.0.0.1:$HGPORT/#changeset-61c9426e69fef294feed5e2bbfc97d39944a5b1c</id>
+    <link href="http://127.0.0.1:$HGPORT/rev/61c9426e69fe"/>
     <author>
      <name>test</name>
      <email>&#116;&#101;&#115;&#116;</email>

--- a/tests/test-hgweb-no-request-uri.t	Fri Oct 08 22:36:11 2010 -0500
+++ b/tests/test-hgweb-no-request-uri.t	Fri Oct 08 22:36:11 2010 -0500
@@ -83,16 +83,16 @@
   <?xml version="1.0" encoding="ascii"?>
   <feed xmlns="http://www.w3.org/2005/Atom">
    <!-- Changelog -->
-   <id>http://127.0.0.1:*/</id> (glob)
-   <link rel="self" href="http://127.0.0.1:*/atom-log"/> (glob)
-   <link rel="alternate" href="http://127.0.0.1:*/"/> (glob)
+   <id>http://127.0.0.1:$HGPORT/</id>
+   <link rel="self" href="http://127.0.0.1:$HGPORT/atom-log"/>
+   <link rel="alternate" href="http://127.0.0.1:$HGPORT/"/>
    <title>repo Changelog</title>
    <updated>1970-01-01T00:00:00+00:00</updated>
   
    <entry>
     <title>test</title>
-    <id>http://127.0.0.1:*/#changeset-61c9426e69fef294feed5e2bbfc97d39944a5b1c</id> (glob)
-    <link href="http://127.0.0.1:*/rev/61c9426e69fe"/> (glob)
+    <id>http://127.0.0.1:$HGPORT/#changeset-61c9426e69fef294feed5e2bbfc97d39944a5b1c</id>
+    <link href="http://127.0.0.1:$HGPORT/rev/61c9426e69fe"/>
     <author>
      <name>test</name>
      <email>&#116;&#101;&#115;&#116;</email>

--- a/tests/test-hgwebdir.t	Fri Oct 08 22:36:11 2010 -0500
+++ b/tests/test-hgwebdir.t	Fri Oct 08 22:36:11 2010 -0500
@@ -83,14 +83,14 @@
 atom-log without basedir
 
   $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT '/a/atom-log' | grep '<link'
-   <link rel="self" href="http://*/a/atom-log"/> (glob)
-   <link rel="alternate" href="http://*/a/"/> (glob)
-    <link href="http://*/a/rev/8580ff50825a"/> (glob)
+   <link rel="self" href="http://*:$HGPORT/a/atom-log"/> (glob)
+   <link rel="alternate" href="http://*:$HGPORT/a/"/> (glob)
+    <link href="http://*:$HGPORT/a/rev/8580ff50825a"/> (glob)
 
 rss-log without basedir
 
   $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT '/a/rss-log' | grep '<guid'
-      <guid isPermaLink="true">http://*/a/rev/8580ff50825a</guid> (glob)
+      <guid isPermaLink="true">http://*:$HGPORT/a/rev/8580ff50825a</guid> (glob)
   $ cat > paths.conf <<EOF
   > [paths]
   > t/a/=$root/a
@@ -395,16 +395,16 @@
   <?xml version="1.0" encoding="ascii"?>
   <feed xmlns="http://www.w3.org/2005/Atom">
    <!-- Changelog -->
-   <id>http://*/t/a/</id> (glob)
-   <link rel="self" href="http://*/t/a/atom-log"/> (glob)
-   <link rel="alternate" href="http://*/t/a/"/> (glob)
+   <id>http://*:$HGPORT1/t/a/</id> (glob)
+   <link rel="self" href="http://*:$HGPORT1/t/a/atom-log"/> (glob)
+   <link rel="alternate" href="http://*:$HGPORT1/t/a/"/> (glob)
    <title>t/a Changelog</title>
    <updated>1970-01-01T00:00:01+00:00</updated>
   
    <entry>
     <title>a</title>
-    <id>http://*/t/a/#changeset-8580ff50825a50c8f716709acdf8de0deddcd6ab</id> (glob)
-    <link href="http://*/t/a/rev/8580ff50825a"/> (glob)
+    <id>http://*:$HGPORT1/t/a/#changeset-8580ff50825a50c8f716709acdf8de0deddcd6ab</id> (glob)
+    <link href="http://*:$HGPORT1/t/a/rev/8580ff50825a"/> (glob)
     <author>
      <name>test</name>
      <email>&#116;&#101;&#115;&#116;</email>
@@ -425,16 +425,16 @@
   <?xml version="1.0" encoding="ascii"?>
   <feed xmlns="http://www.w3.org/2005/Atom">
    <!-- Changelog -->
-   <id>http://*/t/a/</id> (glob)
-   <link rel="self" href="http://*/t/a/atom-log"/> (glob)
-   <link rel="alternate" href="http://*/t/a/"/> (glob)
+   <id>http://*:$HGPORT1/t/a/</id> (glob)
+   <link rel="self" href="http://*:$HGPORT1/t/a/atom-log"/> (glob)
+   <link rel="alternate" href="http://*:$HGPORT1/t/a/"/> (glob)
    <title>t/a Changelog</title>
    <updated>1970-01-01T00:00:01+00:00</updated>
   
    <entry>
     <title>a</title>
-    <id>http://*/t/a/#changeset-8580ff50825a50c8f716709acdf8de0deddcd6ab</id> (glob)
-    <link href="http://*/t/a/rev/8580ff50825a"/> (glob)
+    <id>http://*:$HGPORT1/t/a/#changeset-8580ff50825a50c8f716709acdf8de0deddcd6ab</id> (glob)
+    <link href="http://*:$HGPORT1/t/a/rev/8580ff50825a"/> (glob)
     <author>
      <name>test</name>
      <email>&#116;&#101;&#115;&#116;</email>

--- a/tests/test-http-branchmap.t	Fri Oct 08 22:36:11 2010 -0500
+++ b/tests/test-http-branchmap.t	Fri Oct 08 22:36:11 2010 -0500
@@ -10,7 +10,7 @@
   $ hg -R a ci -Am foo
   adding foo
   $ hgserve -R a --config web.push_ssl=False --config web.allow_push=* --encoding latin1
-  listening at http://localhost*/ (bound to 127.0.0.1:*) (glob)
+  listening at http://localhost*:$HGPORT1/ (bound to 127.0.0.1:$HGPORT1) (glob)
   $ hg --encoding utf-8 clone http://localhost:$HGPORT1 b
   requesting all changes
   adding changesets
@@ -30,7 +30,7 @@
   $ echo bar >> b/foo
   $ hg -R b ci -m bar
   $ hg --encoding utf-8 -R b push
-  pushing to http://localhost:* (glob)
+  pushing to http://localhost:$HGPORT1
   searching for changes
   remote: adding changesets
   remote: adding manifests

--- a/tests/test-http-clone-r.t	Fri Oct 08 22:36:11 2010 -0500
+++ b/tests/test-http-clone-r.t	Fri Oct 08 22:36:11 2010 -0500
@@ -218,7 +218,7 @@
   $ cd ..
   $ cd test-1
   $ hg pull -r 4 http://localhost:$HGPORT/
-  pulling from http://localhost:*/ (glob)
+  pulling from http://localhost:$HGPORT/
   searching for changes
   adding changesets
   adding manifests
@@ -232,7 +232,7 @@
   checking files
   1 files, 3 changesets, 2 total revisions
   $ hg pull http://localhost:$HGPORT/
-  pulling from http://localhost:*/ (glob)
+  pulling from http://localhost:$HGPORT/
   searching for changes
   adding changesets
   adding manifests
@@ -242,7 +242,7 @@
   $ cd ..
   $ cd test-2
   $ hg pull -r 5 http://localhost:$HGPORT/
-  pulling from http://localhost:*/ (glob)
+  pulling from http://localhost:$HGPORT/
   searching for changes
   adding changesets
   adding manifests
@@ -256,7 +256,7 @@
   checking files
   1 files, 5 changesets, 3 total revisions
   $ hg pull http://localhost:$HGPORT/
-  pulling from http://localhost:*/ (glob)
+  pulling from http://localhost:$HGPORT/
   searching for changes
   adding changesets
   adding manifests

--- a/tests/test-http-proxy.t	Fri Oct 08 22:36:11 2010 -0500
+++ b/tests/test-http-proxy.t	Fri Oct 08 22:36:11 2010 -0500
@@ -98,19 +98,19 @@
   updating to branch default
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cat proxy.log
-  * - - [*] "GET http://localhost:*/?pairs=0000000000000000000000000000000000000000-0000000000000000000000000000000000000000&cmd=between HTTP/1.1" - - (glob)
-  * - - [*] "GET http://localhost:*/?cmd=capabilities HTTP/1.1" - - (glob)
-  * - - [*] "GET http://localhost:*/?cmd=stream_out HTTP/1.1" - - (glob)
-  * - - [*] "GET http://localhost:*/?pairs=0000000000000000000000000000000000000000-0000000000000000000000000000000000000000&cmd=between HTTP/1.1" - - (glob)
-  * - - [*] "GET http://localhost:*/?cmd=heads HTTP/1.1" - - (glob)
-  * - - [*] "GET http://localhost:*/?cmd=changegroup&roots=0000000000000000000000000000000000000000 HTTP/1.1" - - (glob)
-  * - - [*] "GET http://localhost:*/?pairs=0000000000000000000000000000000000000000-0000000000000000000000000000000000000000&cmd=between HTTP/1.1" - - (glob)
-  * - - [*] "GET http://localhost:*/?cmd=heads HTTP/1.1" - - (glob)
-  * - - [*] "GET http://localhost:*/?cmd=changegroup&roots=0000000000000000000000000000000000000000 HTTP/1.1" - - (glob)
-  * - - [*] "GET http://localhost:*/?pairs=0000000000000000000000000000000000000000-0000000000000000000000000000000000000000&cmd=between HTTP/1.1" - - (glob)
-  * - - [*] "GET http://localhost:*/?cmd=heads HTTP/1.1" - - (glob)
-  * - - [*] "GET http://localhost:*/?cmd=changegroup&roots=0000000000000000000000000000000000000000 HTTP/1.1" - - (glob)
-  * - - [*] "GET http://localhost:*/?pairs=0000000000000000000000000000000000000000-0000000000000000000000000000000000000000&cmd=between HTTP/1.1" - - (glob)
-  * - - [*] "GET http://localhost:*/?cmd=heads HTTP/1.1" - - (glob)
-  * - - [*] "GET http://localhost:*/?cmd=changegroup&roots=0000000000000000000000000000000000000000 HTTP/1.1" - - (glob)
+  * - - [*] "GET http://localhost:$HGPORT/?pairs=0000000000000000000000000000000000000000-0000000000000000000000000000000000000000&cmd=between HTTP/1.1" - - (glob)
+  * - - [*] "GET http://localhost:$HGPORT/?cmd=capabilities HTTP/1.1" - - (glob)
+  * - - [*] "GET http://localhost:$HGPORT/?cmd=stream_out HTTP/1.1" - - (glob)
+  * - - [*] "GET http://localhost:$HGPORT/?pairs=0000000000000000000000000000000000000000-0000000000000000000000000000000000000000&cmd=between HTTP/1.1" - - (glob)
+  * - - [*] "GET http://localhost:$HGPORT/?cmd=heads HTTP/1.1" - - (glob)
+  * - - [*] "GET http://localhost:$HGPORT/?cmd=changegroup&roots=0000000000000000000000000000000000000000 HTTP/1.1" - - (glob)
+  * - - [*] "GET http://localhost:$HGPORT/?pairs=0000000000000000000000000000000000000000-0000000000000000000000000000000000000000&cmd=between HTTP/1.1" - - (glob)
+  * - - [*] "GET http://localhost:$HGPORT/?cmd=heads HTTP/1.1" - - (glob)
+  * - - [*] "GET http://localhost:$HGPORT/?cmd=changegroup&roots=0000000000000000000000000000000000000000 HTTP/1.1" - - (glob)
+  * - - [*] "GET http://localhost:$HGPORT/?pairs=0000000000000000000000000000000000000000-0000000000000000000000000000000000000000&cmd=between HTTP/1.1" - - (glob)
+  * - - [*] "GET http://localhost:$HGPORT/?cmd=heads HTTP/1.1" - - (glob)
+  * - - [*] "GET http://localhost:$HGPORT/?cmd=changegroup&roots=0000000000000000000000000000000000000000 HTTP/1.1" - - (glob)
+  * - - [*] "GET http://localhost:$HGPORT/?pairs=0000000000000000000000000000000000000000-0000000000000000000000000000000000000000&cmd=between HTTP/1.1" - - (glob)
+  * - - [*] "GET http://localhost:$HGPORT/?cmd=heads HTTP/1.1" - - (glob)
+  * - - [*] "GET http://localhost:$HGPORT/?cmd=changegroup&roots=0000000000000000000000000000000000000000 HTTP/1.1" - - (glob)
 

--- a/tests/test-http.t	Fri Oct 08 22:36:11 2010 -0500
+++ b/tests/test-http.t	Fri Oct 08 22:36:11 2010 -0500
@@ -18,7 +18,7 @@
 Test server address cannot be reused
 
   $ hg serve -p $HGPORT1 2>&1
-  abort: cannot start server at ':*': Address already in use (glob)
+  abort: cannot start server at ':$HGPORT1': Address already in use
   [255]
   $ cd ..
   $ cat hg1.pid hg2.pid >> $DAEMON_PIDS
@@ -77,8 +77,8 @@
   $ echo '[hooks]' >> .hg/hgrc
   $ echo 'changegroup = python ../printenv.py changegroup' >> .hg/hgrc
   $ hg pull
-  changegroup hook: HG_NODE=5fed3813f7f5e1824344fdc9cf8f63bb662c292d HG_SOURCE=pull HG_URL=http://localhost:*/* (glob)
-  pulling from http://localhost:*/ (glob)
+  changegroup hook: HG_NODE=5fed3813f7f5e1824344fdc9cf8f63bb662c292d HG_SOURCE=pull HG_URL=http://localhost:$HGPORT1/ 
+  pulling from http://localhost:$HGPORT1/
   searching for changes
   adding changesets
   adding manifests

--- a/tests/test-incoming-outgoing.t	Fri Oct 08 22:36:11 2010 -0500
+++ b/tests/test-incoming-outgoing.t	Fri Oct 08 22:36:11 2010 -0500
@@ -21,7 +21,7 @@
 http incoming
 
   $ hg -R new incoming http://localhost:$HGPORT/
-  comparing with http://localhost:\d+/ (re)
+  comparing with http://localhost:$HGPORT/
   changeset:   0:00a43fa82f62
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
@@ -69,7 +69,7 @@
   summary:     8
   
   $ hg -R new incoming -r 4 http://localhost:$HGPORT/
-  comparing with http://localhost:\d+/ (re)
+  comparing with http://localhost:$HGPORT/
   changeset:   0:00a43fa82f62
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
@@ -222,7 +222,7 @@
 test with --bundle
 
   $ hg -R new incoming --bundle test.hg http://localhost:$HGPORT/
-  comparing with http://localhost:*/ (glob)
+  comparing with http://localhost:$HGPORT/
   changeset:   0:00a43fa82f62
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
@@ -420,7 +420,7 @@
   summary:     11
   
   $ hg -R test-dev outgoing http://localhost:$HGPORT/
-  comparing with http://localhost:*/ (glob)
+  comparing with http://localhost:$HGPORT/
   searching for changes
   changeset:   9:d89d4abea5bc
   user:        test
@@ -449,7 +449,7 @@
   summary:     13
   
   $ hg -R test-dev outgoing -r 11 http://localhost:$HGPORT/
-  comparing with http://localhost:*/ (glob)
+  comparing with http://localhost:$HGPORT/
   searching for changes
   changeset:   9:d89d4abea5bc
   user:        test

--- a/tests/test-mq-qclone-http.t	Fri Oct 08 22:36:11 2010 -0500
+++ b/tests/test-mq-qclone-http.t	Fri Oct 08 22:36:11 2010 -0500
@@ -141,7 +141,7 @@
 test --mq works and uses correct repository config
 
   $ hg --cwd d outgoing --mq
-  comparing with http://localhost:*/a/.hg/patches (glob)
+  comparing with http://localhost:$HGPORT2/a/.hg/patches
   searching for changes
   no changes found
   [1]

--- a/tests/test-pull-http.t	Fri Oct 08 22:36:11 2010 -0500
+++ b/tests/test-pull-http.t	Fri Oct 08 22:36:11 2010 -0500
@@ -40,7 +40,7 @@
 expect error, pulling not allowed
 
   $ req
-  pulling from http://localhost:*/ (glob)
+  pulling from http://localhost:$HGPORT/
   searching for changes
   abort: authorization failed
   % serve errors

--- a/tests/test-pull.t	Fri Oct 08 22:36:11 2010 -0500
+++ b/tests/test-pull.t	Fri Oct 08 22:36:11 2010 -0500
@@ -44,12 +44,12 @@
   2ed2a3912a0b24502043eae84ee4b279c18b90dd 644   foo
 
   $ hg pull
-  pulling from http://foo:\*\*\*@localhost:*/ (glob)
+  pulling from http://foo:***@localhost:$HGPORT/
   searching for changes
   no changes found
 
   $ hg rollback --dry-run --verbose
-  rolling back to revision -1 (undo pull: http://foo:\*\*\*@localhost:*/) (glob)
+  rolling back to revision -1 (undo pull: http://foo:***@localhost:$HGPORT/)
 
 Issue622: hg init && hg pull -u URL doesn't checkout default branch
 

--- a/tests/test-push-http.t	Fri Oct 08 22:36:11 2010 -0500
+++ b/tests/test-push-http.t	Fri Oct 08 22:36:11 2010 -0500
@@ -25,7 +25,7 @@
 expect ssl error
 
   $ req
-  pushing to http://localhost:*/ (glob)
+  pushing to http://localhost:$HGPORT/
   searching for changes
   remote: ssl required
   % serve errors
@@ -35,7 +35,7 @@
   $ echo '[web]' > .hg/hgrc
   $ echo 'push_ssl = false' >> .hg/hgrc
   $ req
-  pushing to http://localhost:*/ (glob)
+  pushing to http://localhost:$HGPORT/
   searching for changes
   abort: authorization failed
   % serve errors
@@ -44,7 +44,7 @@
 
   $ echo 'allow_push = unperson' >> .hg/hgrc
   $ req
-  pushing to http://localhost:*/ (glob)
+  pushing to http://localhost:$HGPORT/
   searching for changes
   abort: authorization failed
   % serve errors
@@ -55,7 +55,7 @@
   $ echo '[hooks]' >> .hg/hgrc
   $ echo 'changegroup = python ../printenv.py changegroup 0' >> .hg/hgrc
   $ req
-  pushing to http://localhost:*/ (glob)
+  pushing to http://localhost:$HGPORT/
   searching for changes
   remote: adding changesets
   remote: adding manifests
@@ -72,7 +72,7 @@
   $ echo 'push_ssl = false' >> .hg/hgrc
   $ echo 'deny_push = *' >> .hg/hgrc
   $ req
-  pushing to http://localhost:*/ (glob)
+  pushing to http://localhost:$HGPORT/
   searching for changes
   abort: authorization failed
   % serve errors
@@ -81,7 +81,7 @@
 
   $ echo 'deny_push = unperson' >> .hg/hgrc
   $ req
-  pushing to http://localhost:*/ (glob)
+  pushing to http://localhost:$HGPORT/
   searching for changes
   abort: authorization failed
   % serve errors

--- a/tests/test-schemes.t	Fri Oct 08 22:36:11 2010 -0500
+++ b/tests/test-schemes.t	Fri Oct 08 22:36:11 2010 -0500
@@ -24,7 +24,7 @@
 check that {1} syntax works
 
   $ hg incoming --debug parts://localhost
-  using http://localhost:*/ (glob)
+  using http://localhost:$HGPORT/
   sending between command
   comparing with parts://localhost
   sending heads command

--- a/tests/test-static-http.t	Fri Oct 08 22:36:11 2010 -0500
+++ b/tests/test-static-http.t	Fri Oct 08 22:36:11 2010 -0500
@@ -66,8 +66,8 @@
   $ echo '[hooks]' >> .hg/hgrc
   $ echo 'changegroup = python ../printenv.py changegroup' >> .hg/hgrc
   $ hg pull
-  changegroup hook: HG_NODE=822d6e31f08b9d6e3b898ce5e52efc0a4bf4905a HG_SOURCE=pull HG_URL=http://localhost:*/remote  (glob)
-  pulling from static-http://localhost:*/remote (glob)
+  changegroup hook: HG_NODE=822d6e31f08b9d6e3b898ce5e52efc0a4bf4905a HG_SOURCE=pull HG_URL=http://localhost:$HGPORT/remote 
+  pulling from static-http://localhost:$HGPORT/remote
   searching for changes
   adding changesets
   adding manifests
@@ -82,7 +82,7 @@
   $ echo more foo >> bar
   $ hg commit -m"test"
   $ hg push
-  pushing to static-http://localhost:*/remote (glob)
+  pushing to static-http://localhost:$HGPORT/remote
   abort: cannot lock static-http repository
   [255]
 
@@ -125,7 +125,7 @@
   $ cat a
   a
   $ hg paths
-  default = static-http://localhost:*/ (glob)
+  default = static-http://localhost:$HGPORT/
 
 test with empty repo (issue965)
 
@@ -143,13 +143,13 @@
   checking files
   0 files, 0 changesets, 0 total revisions
   $ hg paths
-  default = static-http://localhost:*/remotempty (glob)
+  default = static-http://localhost:$HGPORT/remotempty
 
 test with non-repo
 
   $ cd ..
   $ mkdir notarepo
   $ hg clone static-http://localhost:$HGPORT/notarepo local3
-  abort: 'http://localhost:*/notarepo' does not appear to be an hg repository! (glob)
+  abort: 'http://localhost:$HGPORT/notarepo' does not appear to be an hg repository!
   [255]
   $ kill $!

--- a/tests/test-subrepo-relative-path.t	Fri Oct 08 22:36:11 2010 -0500
+++ b/tests/test-subrepo-relative-path.t	Fri Oct 08 22:36:11 2010 -0500
@@ -44,7 +44,7 @@
   adding file changes
   added 1 changesets with 3 changes to 3 files
   updating to branch default
-  pulling subrepo sub from http://localhost:[0-9]+/sub (re)
+  pulling subrepo sub from http://localhost:$HGPORT/sub
   requesting all changes
   adding changesets
   adding manifests