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.

tests/test-hgweb

@@ -1,44 +1,44 b''
 #!/bin/sh
 # Some tests for hgweb. Tests static files, plain files and different 404's.
 
 hg init test
 cd test
 mkdir da
 echo foo > da/foo
 echo foo > foo
 hg ci -Ambase -d '0 0'
 hg serve -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log
 cat hg.pid >> $DAEMON_PIDS
 echo % manifest
 ("$TESTDIR/get-with-headers.py" localhost:$HGPORT '/file/tip/?style=raw')
 ("$TESTDIR/get-with-headers.py" localhost:$HGPORT '/file/tip/da?style=raw')
 
 echo % plain file
 "$TESTDIR/get-with-headers.py" localhost:$HGPORT '/file/tip/foo?style=raw'
 
 echo % should give a 404 - static file that does not exist
 "$TESTDIR/get-with-headers.py" localhost:$HGPORT '/static/bogus'
 
 echo % should give a 404 - bad revision
 "$TESTDIR/get-with-headers.py" localhost:$HGPORT '/file/spam/foo?style=raw'
 
 echo % should give a 400 - bad command
 "$TESTDIR/get-with-headers.py" localhost:$HGPORT '/file/tip/foo?cmd=spam&style=raw' | sed 's/400.*/400/'
 
 echo % should give a 404 - file does not exist
 "$TESTDIR/get-with-headers.py" localhost:$HGPORT '/file/tip/bork?style=raw'
 "$TESTDIR/get-with-headers.py" localhost:$HGPORT '/file/tip/bork'
 "$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
 python -c "print len(file('access.log').readlines()), 'log lines written'"
 
 echo % static file
 "$TESTDIR/get-with-headers.py" localhost:$HGPORT '/static/style-gitweb.css'
 
 echo % errors
 cat errors.log

tests/test-hgweb-diffs

@@ -1,34 +1,34 b''
 echo % setting up repo
 hg init test
 cd test
 echo a > a
 echo b > b
 hg ci -Ama
 
 echo % change permissions for git diffs
 chmod 755 a
 hg ci -Amb
 
 echo % set up hgweb
 hg serve -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log
 cat hg.pid >> $DAEMON_PIDS
 
 echo % revision
 "$TESTDIR/get-with-headers.py" localhost:$HGPORT '/rev/0'
 
 echo % diff removed file
 "$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
 
 echo % revision
 "$TESTDIR/get-with-headers.py" localhost:$HGPORT '/rev/0'
 
 echo % diff removed file
 "$TESTDIR/get-with-headers.py" localhost:$HGPORT '/diff/tip/a'
 
 echo % errors
 cat errors.log