Mercurial > hg
changeset 16334:b9bd95e61b49 stable 2.1.2
tests: fix shutdown race in test-bad-pull
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Sun, 01 Apr 2012 14:23:55 -0500 |
| parents | 900767dfa80d |
| children | 798f655a0681 |
| files | tests/test-bad-pull.t |
| diffstat | 1 files changed, 9 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-bad-pull.t Sun Apr 01 18:18:48 2012 +0900 +++ b/tests/test-bad-pull.t Sun Apr 01 14:23:55 2012 -0500 @@ -13,12 +13,18 @@ > handler_class=SimpleHTTPServer.SimpleHTTPRequestHandler): > server_address = ('localhost', int(os.environ['HGPORT'])) > httpd = server_class(server_address, handler_class) - > os.system("hg clone http://localhost:$HGPORT/foo copy2&") + > open("listening", "w") > httpd.handle_request() > run() > EOF - $ python dumb.py + $ python dumb.py 2> log & + $ P=$! + $ while [ ! -f listening ]; do true; done + $ hg clone http://localhost:$HGPORT/foo copy2 + abort: HTTP Error 404: * (glob) + [255] + $ wait $P + $ cat log localhost - - [*] code 404, message File not found (glob) localhost - - [*] "GET /foo?cmd=capabilities HTTP/1.1" 404 - (glob) - abort: HTTP Error 404: * (glob)