##// END OF EJS Templates
tests: fix shutdown race in test-bad-pull
Matt Mackall -
r16334:b9bd95e6 2.1.2 stable
parent child Browse files
Show More
@@ -1,24 +1,30
1 $ "$TESTDIR/hghave" serve || exit 80
1 $ "$TESTDIR/hghave" serve || exit 80
2
2
3 $ hg clone http://localhost:$HGPORT/ copy
3 $ hg clone http://localhost:$HGPORT/ copy
4 abort: error: Connection refused
4 abort: error: Connection refused
5 [255]
5 [255]
6
6
7 $ test -d copy
7 $ test -d copy
8 [1]
8 [1]
9
9
10 $ cat > dumb.py <<EOF
10 $ cat > dumb.py <<EOF
11 > import BaseHTTPServer, SimpleHTTPServer, os, signal
11 > import BaseHTTPServer, SimpleHTTPServer, os, signal
12 > def run(server_class=BaseHTTPServer.HTTPServer,
12 > def run(server_class=BaseHTTPServer.HTTPServer,
13 > handler_class=SimpleHTTPServer.SimpleHTTPRequestHandler):
13 > handler_class=SimpleHTTPServer.SimpleHTTPRequestHandler):
14 > server_address = ('localhost', int(os.environ['HGPORT']))
14 > server_address = ('localhost', int(os.environ['HGPORT']))
15 > httpd = server_class(server_address, handler_class)
15 > httpd = server_class(server_address, handler_class)
16 > os.system("hg clone http://localhost:$HGPORT/foo copy2&")
16 > open("listening", "w")
17 > httpd.handle_request()
17 > httpd.handle_request()
18 > run()
18 > run()
19 > EOF
19 > EOF
20
20
21 $ python dumb.py
21 $ python dumb.py 2> log &
22 $ P=$!
23 $ while [ ! -f listening ]; do true; done
24 $ hg clone http://localhost:$HGPORT/foo copy2
25 abort: HTTP Error 404: * (glob)
26 [255]
27 $ wait $P
28 $ cat log
22 localhost - - [*] code 404, message File not found (glob)
29 localhost - - [*] code 404, message File not found (glob)
23 localhost - - [*] "GET /foo?cmd=capabilities HTTP/1.1" 404 - (glob)
30 localhost - - [*] "GET /foo?cmd=capabilities HTTP/1.1" 404 - (glob)
24 abort: HTTP Error 404: * (glob)
General Comments 0
You need to be logged in to leave comments. Login now