tests: unify test-bad-pull

tests/test-bad-pull.t

@@ -1,30 +1,34
-#!/bin/sh
-
-hg clone http://localhost:$HGPORT/ copy
-echo $?
-test -d copy || echo copy: No such file or directory
+  $ hg clone http://localhost:$HGPORT/ copy
+  abort: error: Connection refused
 
-cat > dumb.py <<EOF
-import BaseHTTPServer, SimpleHTTPServer, os, signal
+  $ echo $?
+  0
 
-def run(server_class=BaseHTTPServer.HTTPServer,
-        handler_class=SimpleHTTPServer.SimpleHTTPRequestHandler):
-    server_address = ('localhost', int(os.environ['HGPORT']))
-    httpd = server_class(server_address, handler_class)
-    httpd.serve_forever()
+  $ test -d copy || echo copy: No such file or directory
+  copy: No such file or directory
 
-signal.signal(signal.SIGTERM, lambda x: sys.exit(0))
-run()
-EOF
-
-python dumb.py 2>/dev/null &
-echo $! >> $DAEMON_PIDS
+  $ cat > dumb.py <<EOF
+  > import BaseHTTPServer, SimpleHTTPServer, os, signal
+  > def run(server_class=BaseHTTPServer.HTTPServer,
+  >         handler_class=SimpleHTTPServer.SimpleHTTPRequestHandler):
+  >     server_address = ('localhost', int(os.environ['HGPORT']))
+  >     httpd = server_class(server_address, handler_class)
+  >     httpd.serve_forever()
+  > signal.signal(signal.SIGTERM, lambda x: sys.exit(0))
+  > run()
+  > EOF
 
-# give the server some time to start running
-sleep 1
+  $ python dumb.py 2>/dev/null &
+  $ echo $! >> $DAEMON_PIDS
+
+give the server some time to start running
+
+  $ sleep 1
 
-hg clone http://localhost:$HGPORT/foo copy2 2>&1 | \
-    sed -e 's/404.*/404/' -e 's/Date:.*/Date:/'
-echo $?
+  $ hg clone http://localhost:$HGPORT/foo copy2 2>&1
+  abort: HTTP Error 404: .*
 
-kill $!
+  $ echo $?
+  0
+
+  $ kill $!