changeset 37592:fb91757471b5

tests: glob away fqdn wherever we print it These localhost instances are actually from a getfqdn call, which means on some of my test systems it comes out as localhost.localdomain or 1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.arpa. I'm tired of this, so let's glob it away. Differential Revision: https://phab.mercurial-scm.org/D3251
author Augie Fackler <augie@google.com>
date Wed, 11 Apr 2018 17:07:07 -0400
parents b5ca5d34fe8d
children 314f39e5fa86
files tests/test-pull-bundle.t tests/test-push-http.t
diffstat 2 files changed, 5 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/tests/test-pull-bundle.t	Wed Apr 11 16:26:40 2018 -0400
+++ b/tests/test-pull-bundle.t	Wed Apr 11 17:07:07 2018 -0400
@@ -49,7 +49,7 @@
   > 0.hg heads=bbd179dfa0a71671c253b3ae0aa1513b60d199fa
   > EOF
   $ hg --config blackbox.track=debug --debug serve -p $HGPORT2 -d --pid-file=../repo.pid
-  listening at http://localhost:$HGPORT2/ (bound to $LOCALIP:$HGPORT2) (?)
+  listening at http://*:$HGPORT2/ (bound to $LOCALIP:$HGPORT2) (glob) (?)
   $ cat ../repo.pid >> $DAEMON_PIDS
   $ cd ..
   $ hg clone -r 0 http://localhost:$HGPORT2/ repo.pullbundle
@@ -91,7 +91,7 @@
 
   $ cd repo
   $ hg --config blackbox.track=debug --debug serve -p $HGPORT2 -d --pid-file=../repo.pid
-  listening at http://localhost:$HGPORT2/ (bound to $LOCALIP:$HGPORT2) (?)
+  listening at http://*:$HGPORT2/ (bound to $LOCALIP:$HGPORT2) (glob) (?)
   $ cat ../repo.pid >> $DAEMON_PIDS
   $ cd ..
   $ hg clone http://localhost:$HGPORT2/ repo.pullbundle2
@@ -126,7 +126,7 @@
   > 0.hg heads=bbd179dfa0a71671c253b3ae0aa1513b60d199fa
   > EOF
   $ hg --config blackbox.track=debug --debug serve -p $HGPORT2 -d --pid-file=../repo.pid
-  listening at http://localhost:$HGPORT2/ (bound to $LOCALIP:$HGPORT2) (?)
+  listening at http://*:$HGPORT2/ (bound to $LOCALIP:$HGPORT2) (glob) (?)
   $ cat ../repo.pid >> $DAEMON_PIDS
   $ cd ..
   $ hg clone -r 0 http://localhost:$HGPORT2/ repo.pullbundle3
--- a/tests/test-push-http.t	Wed Apr 11 16:26:40 2018 -0400
+++ b/tests/test-push-http.t	Wed Apr 11 17:07:07 2018 -0400
@@ -79,7 +79,7 @@
   > txnclose-phase.test = sh $TESTTMP/hook.sh 
   > EOF
   $ req "--debug --config extensions.blackbox="
-  listening at http://localhost:$HGPORT/ (bound to $LOCALIP:$HGPORT) (?)
+  listening at http://*:$HGPORT/ (bound to $LOCALIP:$HGPORT) (glob) (?)
   pushing to http://localhost:$HGPORT/
   searching for changes
   remote: redirecting incoming bundle to */hg-unbundle-* (glob)
@@ -100,7 +100,7 @@
   $ hg rollback
   repository tip rolled back to revision 0 (undo serve)
   $ req "--debug --config server.streamunbundle=True --config extensions.blackbox="
-  listening at http://localhost:$HGPORT/ (bound to $LOCALIP:$HGPORT) (?)
+  listening at http://*:$HGPORT/ (bound to $LOCALIP:$HGPORT) (glob) (?)
   pushing to http://localhost:$HGPORT/
   searching for changes
   remote: adding changesets