Mercurial > hg-stable
annotate tests/test-bad-pull @ 6179:36ab165abbe2
patch: fix iterhunks() with trailing binary file removal
Like some renames or copy operations, binary file removal does not generate any
"file" or "hunk" action, but was not tagged as such and let iterhunk() assume
no hunk was applied for the deleted file.
author | Patrick Mezard <pmezard@gmail.com> |
---|---|
date | Thu, 28 Feb 2008 00:07:37 +0100 |
parents | e3a0c092b4e2 |
children | 490e40816cbd |
rev | line source |
---|---|
800
ec85f9e6f3b1
Don't use 'set -x', fix exports, sed and hexdump usage for Solaris.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
705
diff
changeset
|
1 #!/bin/sh |
395 | 2 |
5384
e3a0c092b4e2
Allow tests to run in parallel.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4317
diff
changeset
|
3 hg clone http://localhost:$HGPORT/ copy |
503
c6a2e41c8c60
Fix troubles with clone and exception handling
mpm@selenic.com
parents:
495
diff
changeset
|
4 echo $? |
3469
33b6c8193652
Don't use test -e in tests - sh doesn't like it on Solaris
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3428
diff
changeset
|
5 test -d copy || echo copy: No such file or directory |
395 | 6 |
7 cat > dumb.py <<EOF | |
5384
e3a0c092b4e2
Allow tests to run in parallel.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4317
diff
changeset
|
8 import BaseHTTPServer, SimpleHTTPServer, os, signal |
395 | 9 |
10 def run(server_class=BaseHTTPServer.HTTPServer, | |
11 handler_class=SimpleHTTPServer.SimpleHTTPRequestHandler): | |
5384
e3a0c092b4e2
Allow tests to run in parallel.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4317
diff
changeset
|
12 server_address = ('localhost', int(os.environ['HGPORT'])) |
395 | 13 httpd = server_class(server_address, handler_class) |
14 httpd.serve_forever() | |
15 | |
16 signal.signal(signal.SIGTERM, lambda x: sys.exit(0)) | |
17 run() | |
18 EOF | |
19 | |
20 python dumb.py 2>/dev/null & | |
2572
d22d730c96ed
tests: record few more daemon pids to be safe
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2438
diff
changeset
|
21 echo $! >> $DAEMON_PIDS |
395 | 22 |
4317
66249be9aa23
test-bad-pull: try to avoid timing-related failures
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3469
diff
changeset
|
23 # give the server some time to start running |
66249be9aa23
test-bad-pull: try to avoid timing-related failures
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3469
diff
changeset
|
24 sleep 1 |
66249be9aa23
test-bad-pull: try to avoid timing-related failures
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3469
diff
changeset
|
25 |
5384
e3a0c092b4e2
Allow tests to run in parallel.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4317
diff
changeset
|
26 http_proxy= hg clone http://localhost:$HGPORT/foo copy2 2>&1 | \ |
2438
a765f853439d
test-bad-pull: fix change in error output.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
1962
diff
changeset
|
27 sed -e 's/404.*/404/' -e 's/Date:.*/Date:/' |
503
c6a2e41c8c60
Fix troubles with clone and exception handling
mpm@selenic.com
parents:
495
diff
changeset
|
28 echo $? |
395 | 29 |
492
9bd468e36de3
Use "kill $!" to kill running background processes.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
485
diff
changeset
|
30 kill $! |