Mercurial > hg > mercurial-crew-with-dirclash

changeset 5386:8051549afb32

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix accidentally broken test.
author Bryan O'Sullivan <bos@serpentine.com>
date Fri, 05 Oct 2007 12:28:18 -0700
parents caadfbc439c6
children 4b6f0aa568e5
files tests/test-push-http tests/test-push-http.out
diffstat 2 files changed, 8 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/tests/test-push-http
+++ b/tests/test-push-http
@@ -18,7 +18,7 @@ cd ../test
 echo % expect ssl error
 hg serve -p $HGPORT -d --pid-file=hg.pid
 cat hg.pid >> $DAEMON_PIDS
-hg --cwd ../test2 push http://localhost:$HGPORT/
+hg --cwd ../test2 push http://localhost:$HGPORT/ | sed -e 's,:[0-9][0-9]*/,/,'
 kill `cat hg.pid`
 
 echo % expect authorization error
@@ -26,14 +26,14 @@ echo '[web]' > .hg/hgrc
 echo 'push_ssl = false' >> .hg/hgrc
 hg serve -p $HGPORT -d --pid-file=hg.pid
 cat hg.pid >> $DAEMON_PIDS
-hg --cwd ../test2 push http://localhost:$HGPORT/
+hg --cwd ../test2 push http://localhost:$HGPORT/ | sed -e 's,:[0-9][0-9]*/,/,'
 kill `cat hg.pid`
 
 echo % expect authorization error: must have authorized user
 echo 'allow_push = unperson' >> .hg/hgrc
 hg serve -p $HGPORT -d --pid-file=hg.pid
 cat hg.pid >> $DAEMON_PIDS
-hg --cwd ../test2 push http://localhost:$HGPORT/
+hg --cwd ../test2 push http://localhost:$HGPORT/ | sed -e 's,:[0-9][0-9]*/,/,'
 kill `cat hg.pid`
 
 echo % expect success
@@ -42,7 +42,7 @@ echo '[hooks]' >> .hg/hgrc
 echo 'changegroup = python ../printenv.py changegroup 0 ../urls' >> .hg/hgrc
 hg serve -p $HGPORT -d --pid-file=hg.pid
 cat hg.pid >> $DAEMON_PIDS
-hg --cwd ../test2 push http://localhost:$HGPORT/
+hg --cwd ../test2 push http://localhost:$HGPORT/ | sed -e 's,:[0-9][0-9]*/,/,'
 kill `cat hg.pid`
 hg rollback
 
--- a/tests/test-push-http.out
+++ b/tests/test-push-http.out
@@ -1,19 +1,19 @@
 adding a
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 % expect ssl error
-pushing to http://localhost:23451/
+pushing to http://localhost/
 searching for changes
 ssl required
 % expect authorization error
-pushing to http://localhost:23451/
+pushing to http://localhost/
 searching for changes
 push not authorized
 % expect authorization error: must have authorized user
-pushing to http://localhost:23451/
+pushing to http://localhost/
 searching for changes
 push not authorized
 % expect success
-pushing to http://localhost:23451/
+pushing to http://localhost/
 searching for changes
 adding changesets
 adding manifests