Mercurial > hg
annotate tests/test-diffdir @ 2571:83cfd95eafb5
tests: add timeouts, make run-tests.py clean up dead daemon processes
test timeout feature is needed for test with python 2.5 beta. if test
does not complete in time (30 seconds is default), it is killed.
some times daemon process used in test can be alive after the test
is killed by user or by timeout. tests now record daemon pids into
$DAEMON_PIDS and run-tests.py kills all living daemons after every test.
final little change is to add newline to end of pid file printed by
"hg serve", else "cat hg.pid >> $DAEMON_FILES" gives garbage.
author | Vadim Gelfer <vadim.gelfer@gmail.com> |
---|---|
date | Thu, 06 Jul 2006 11:45:34 -0700 |
parents | 7544700fd931 |
children | 096f1c73cdc3 |
rev | line source |
---|---|
536 | 1 #!/bin/sh |
2 | |
3 hg init | |
4 touch a | |
5 hg add a | |
1933
7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1723
diff
changeset
|
6 hg ci -m "a" -d "1000000 0" |
536 | 7 |
8 echo 123 > b | |
9 hg add b | |
949 | 10 hg diff | sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \ |
11 -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/" | |
536 | 12 |
949 | 13 hg diff -r tip | sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \ |
14 -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/" | |
1723
fde8fb2cbede
Fix diff against an empty file (issue124) and add a test for this.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
981
diff
changeset
|
15 |
fde8fb2cbede
Fix diff against an empty file (issue124) and add a test for this.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
981
diff
changeset
|
16 echo foo > a |
fde8fb2cbede
Fix diff against an empty file (issue124) and add a test for this.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
981
diff
changeset
|
17 hg diff | sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \ |
fde8fb2cbede
Fix diff against an empty file (issue124) and add a test for this.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
981
diff
changeset
|
18 -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/" |