Mercurial > hg
changeset 7428:fdcde929ce4f
tests: use killdaemons in hgweb tests
hgweb tests often failed on my system because the serve port wasn't free when a
new hgweb was started; the killed hg wasn't completely dead yet.
Now we use killdaemons which waits for the process to die.
| author | Mads Kiilerich <mads@kiilerich.com> |
|---|---|
| date | Thu, 27 Nov 2008 00:57:30 +0100 |
| parents | f21e3d0e335b |
| children | dbc40381620e |
| files | tests/test-hgweb tests/test-hgweb-diffs |
| diffstat | 2 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-hgweb Wed Nov 26 22:27:37 2008 +0100 +++ b/tests/test-hgweb Thu Nov 27 00:57:30 2008 +0100 @@ -31,7 +31,7 @@ "$TESTDIR/get-with-headers.py" localhost:$HGPORT '/diff/tip/bork?style=raw' echo % stop and restart -kill `cat hg.pid` +"$TESTDIR/killdaemons.py" hg serve -p $HGPORT -d --pid-file=hg.pid -A access.log cat hg.pid >> $DAEMON_PIDS # Test the access/error files are opened in append mode
--- a/tests/test-hgweb-diffs Wed Nov 26 22:27:37 2008 +0100 +++ b/tests/test-hgweb-diffs Thu Nov 27 00:57:30 2008 +0100 @@ -20,7 +20,7 @@ "$TESTDIR/get-with-headers.py" localhost:$HGPORT '/diff/tip/a' echo % set up hgweb with git diffs -kill `cat hg.pid` +"$TESTDIR/killdaemons.py" hg serve --config 'diff.git=1' -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log cat hg.pid >> $DAEMON_PIDS