# HG changeset patch
# User Thomas Arendsen Hein <thomas@intevation.de>
# Date 1205455155 -3600
# Node ID 35bf9c23e17a2945741df6b5dffce676c7f63f1f
# Parent  0d0939b2d272bec33209de1dd559614f6b6e8d81
adjust test-fetch output to non-default HGPORT, e.g. with run-tests.py -j

diff -r 0d0939b2d272 -r 35bf9c23e17a tests/test-fetch
--- a/tests/test-fetch	Thu Mar 13 19:50:03 2008 -0300
+++ b/tests/test-fetch	Fri Mar 14 01:39:15 2008 +0100
@@ -1,5 +1,9 @@
 #!/bin/sh
 
+# adjust to non-default HGPORT, e.g. with run-tests.py -j
+hideport() { sed "s/localhost:$HGPORT/localhost:20059/"; }
+hidehash() { sed "s/changeset 3:............ merges/changeset 3:... merges/"; }
+
 echo "[extensions]" >> $HGRCPATH
 echo "fetch=" >> $HGRCPATH
 
@@ -36,12 +40,12 @@
 cat a/hg.pid >> "$DAEMON_PIDS"
 
 echo '% fetch over http, no auth'
-hg --cwd d fetch -d '5 0' http://localhost:$HGPORT/
-hg --cwd d tip --template '{desc}\n'
+hg --cwd d fetch -d '5 0' http://localhost:$HGPORT/ | hideport | hidehash
+hg --cwd d tip --template '{desc}\n' | hideport
 
 echo '% fetch over http with auth (should be hidden in desc)'
-hg --cwd e fetch -d '5 0' http://user:password@localhost:$HGPORT/
-hg --cwd e tip --template '{desc}\n'
+hg --cwd e fetch -d '5 0' http://user:password@localhost:$HGPORT/ | hideport | hidehash
+hg --cwd e tip --template '{desc}\n' | hideport
 
 hg clone a f
 hg clone a g
diff -r 0d0939b2d272 -r 35bf9c23e17a tests/test-fetch.out
--- a/tests/test-fetch.out	Thu Mar 13 19:50:03 2008 -0300
+++ b/tests/test-fetch.out	Fri Mar 14 01:39:15 2008 +0100
@@ -41,7 +41,7 @@
 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
 merging with 1:5e056962225c
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-new changeset 3:0b6439e938f9 merges remote changes with local
+new changeset 3:... merges remote changes with local
 Automated merge with http://localhost:20059/
 % fetch over http with auth (should be hidden in desc)
 pulling from http://user:***@localhost:20059/
@@ -54,7 +54,7 @@
 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
 merging with 1:5e056962225c
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-new changeset 3:0b6439e938f9 merges remote changes with local
+new changeset 3:... merges remote changes with local
 Automated merge with http://localhost:20059/
 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
 2 files updated, 0 files merged, 0 files removed, 0 files unresolved