make server tests use --daemon.

tests/test-archive

@@ -1,38 +1,39
 #!/bin/sh
 
 mkdir test
 cd test
 hg init
 echo foo>foo
 hg addremove
 hg commit -m 1
 echo bar>bar
 hg addremove
 hg commit -m 2
 mkdir baz
 echo bletch>baz/bletch
 hg addremove
 hg commit -m 3
 echo "[web]" >> .hg/hgrc
 echo "name = test-archive" >> .hg/hgrc
 echo "allowzip = true" >> .hg/hgrc
 echo "allowgz = true" >> .hg/hgrc
 echo "allowbz2 = true" >> .hg/hgrc
-hg serve -p 20059 > /dev/null &
-sleep 1 # wait for server to be started
+serverpid=`mktemp`
+hg serve -p 20059 -d --pid-file=$serverpid
 
 TIP=`hg id -v | cut -f1 -d' '`
 QTIP=`hg id -q`
 cat > getarchive.py <<EOF
 import sys, urllib2
 node, archive = sys.argv[1:]
 f = urllib2.urlopen('http://127.0.0.1:20059/?cmd=archive;node=%s;type=%s'
                     % (node, archive))
 sys.stdout.write(f.read())
 EOF
 http_proxy= python getarchive.py "$TIP" gz | tar tzf - | sed "s/$QTIP/TIP/"
 http_proxy= python getarchive.py "$TIP" bz2 | tar tjf - | sed "s/$QTIP/TIP/"
 http_proxy= python getarchive.py "$TIP" zip > archive.zip
 unzip -t archive.zip | sed "s/$QTIP/TIP/"
 
-kill $!
+kill `cat $serverpid`
+rm $serverpid

tests/test-archive.out

@@ -1,15 +1,14
 adding foo
 adding bar
 adding baz/bletch
 test-archive-TIP/bar
 test-archive-TIP/baz/bletch
 test-archive-TIP/foo
 test-archive-TIP/bar
 test-archive-TIP/baz/bletch
 test-archive-TIP/foo
 Archive:  archive.zip
     testing: test-archive-TIP/bar   OK
     testing: test-archive-TIP/baz/bletch   OK
     testing: test-archive-TIP/foo   OK
 No errors detected in compressed data of archive.zip.
-killed!

tests/test-pull

@@ -1,22 +1,23
 #!/bin/sh
 
 mkdir test
 cd test
 echo foo>foo
 hg init
 hg addremove
 hg commit -m 1
 hg verify
-hg serve -p 20059 > /dev/null &
-sleep 1 # wait for server to be started
+serverpid=`mktemp`
+hg serve -p 20059 -d --pid-file=$serverpid
 cd ..
 
 hg clone http://localhost:20059/ copy
 cd copy
 hg verify
 hg co
 cat foo
 hg manifest
 hg pull
 
-kill $!
+kill `cat $serverpid`
+rm $serverpid

tests/test-pull.out

@@ -1,22 +1,21
 adding foo
 checking changesets
 checking manifests
 crosschecking files in changesets and manifests
 checking files
 1 files, 1 changesets, 1 total revisions
 requesting all changes
 adding changesets
 adding manifests
 adding file changes
 added 1 changesets with 1 changes to 1 files
 checking changesets
 checking manifests
 crosschecking files in changesets and manifests
 checking files
 1 files, 1 changesets, 1 total revisions
 foo
 2ed2a3912a0b24502043eae84ee4b279c18b90dd 644 foo
 pulling from http://localhost:20059/
 searching for changes
 no changes found
-killed!