merge with self.
authorVadim Gelfer <vadim.gelfer@gmail.com>
Thu, 15 Jun 2006 16:38:23 -0700
changeset 2440 cc1011a7ed09
parent 2438 a765f853439d (diff)
parent 2439 e8c4f3d3df8c (current diff)
child 2441 801dfe0aa53a
merge with self.
mercurial/sshrepo.py
--- a/tests/test-bad-pull
+++ b/tests/test-bad-pull
@@ -19,7 +19,8 @@ EOF
 
 python dumb.py 2>/dev/null &
 
-http_proxy= hg clone http://localhost:20059/foo copy2
+http_proxy= hg clone http://localhost:20059/foo copy2 2>&1 | \
+    sed -e 's/404.*/404/' -e 's/Date:.*/Date:/'
 echo $?
 
 kill $!
--- a/tests/test-bad-pull.out
+++ b/tests/test-bad-pull.out
@@ -1,5 +1,9 @@
 abort: error: Connection refused
 255
 copy: No such file or directory
-abort: HTTP Error 404: File not found
-255
+abort: HTTP Error 404
+Date:
+Content-Type: text/html
+Connection: close
+
+0