changeset 17539:bc7377160fa7

tests: enable more server tests on Windows
author Patrick Mezard <patrick@mezard.eu>
date Wed, 12 Sep 2012 22:21:54 +0200
parents 31ca918d539a
children f2bcc5975f10
files tests/test-share.t tests/test-subrepo-relative-path.t tests/test-transplant.t tests/test-treediscovery-legacy.t tests/test-treediscovery.t tests/test-unbundlehash.t tests/test-wireproto.t
diffstat 7 files changed, 25 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/tests/test-share.t	Wed Sep 12 22:31:54 2012 +0200
+++ b/tests/test-share.t	Wed Sep 12 22:21:54 2012 +0200
@@ -1,4 +1,4 @@
-  $ "$TESTDIR/hghave" serve || exit 80
+  $ "$TESTDIR/hghave" killdaemons || exit 80
 
   $ echo "[extensions]"      >> $HGRCPATH
   $ echo "share = "          >> $HGRCPATH
@@ -127,3 +127,8 @@
   c2e0ac586386 tip
 
   $ cd ..
+
+Explicitly kill daemons to let the test exit on Windows
+
+  $ "$TESTDIR/killdaemons.py" $DAEMON_PIDS
+
--- a/tests/test-subrepo-relative-path.t	Wed Sep 12 22:31:54 2012 +0200
+++ b/tests/test-subrepo-relative-path.t	Wed Sep 12 22:21:54 2012 +0200
@@ -1,4 +1,4 @@
-  $ "$TESTDIR/hghave" serve || exit 80
+  $ "$TESTDIR/hghave" killdaemons || exit 80
 
 Preparing the subrepository 'sub'
 
--- a/tests/test-transplant.t	Wed Sep 12 22:31:54 2012 +0200
+++ b/tests/test-transplant.t	Wed Sep 12 22:21:54 2012 +0200
@@ -1,4 +1,4 @@
-  $ "$TESTDIR/hghave" serve || exit 80
+  $ "$TESTDIR/hghave" killdaemons || exit 80
 
   $ cat <<EOF >> $HGRCPATH
   > [extensions]
@@ -632,3 +632,7 @@
   skipping emptied changeset 7a7d57e15850
   $ cd ..
 
+Explicitly kill daemons to let the test exit on Windows
+
+  $ "$TESTDIR/killdaemons.py" $DAEMON_PIDS
+
--- a/tests/test-treediscovery-legacy.t	Wed Sep 12 22:31:54 2012 +0200
+++ b/tests/test-treediscovery-legacy.t	Wed Sep 12 22:21:54 2012 +0200
@@ -1,4 +1,4 @@
-  $ "$TESTDIR/hghave" serve || exit 80
+  $ "$TESTDIR/hghave" killdaemons || exit 80
 
 Tests discovery against servers without getbundle support:
 
--- a/tests/test-treediscovery.t	Wed Sep 12 22:31:54 2012 +0200
+++ b/tests/test-treediscovery.t	Wed Sep 12 22:21:54 2012 +0200
@@ -1,4 +1,4 @@
-  $ "$TESTDIR/hghave" serve || exit 80
+  $ "$TESTDIR/hghave" killdaemons || exit 80
 
 Tests discovery against servers without getbundle support:
 
--- a/tests/test-unbundlehash.t	Wed Sep 12 22:31:54 2012 +0200
+++ b/tests/test-unbundlehash.t	Wed Sep 12 22:21:54 2012 +0200
@@ -1,4 +1,4 @@
-  $ "$TESTDIR/hghave" serve || exit 80
+  $ "$TESTDIR/hghave" killdaemons || exit 80
 
 Test wire protocol unbundle with hashed heads (capability: unbundlehash)
 
@@ -30,3 +30,8 @@
 
   $ cat access.log | grep unbundle
   * - - [*] "POST /?cmd=unbundle HTTP/1.1" 200 - x-hgarg-1:heads=686173686564+6768033e216468247bd031a0a2d9876d79818f8f (glob)
+
+Explicitly kill daemons to let the test exit on Windows
+
+  $ "$TESTDIR/killdaemons.py" $DAEMON_PIDS
+
--- a/tests/test-wireproto.t	Wed Sep 12 22:31:54 2012 +0200
+++ b/tests/test-wireproto.t	Wed Sep 12 22:21:54 2012 +0200
@@ -1,4 +1,4 @@
-  $ "$TESTDIR/hghave" serve || exit 80
+  $ "$TESTDIR/hghave" killdaemons || exit 80
 
 Test wire protocol argument passing
 
@@ -112,3 +112,7 @@
   $ hg debugwireargs --ssh "python ./dummyssh" ssh://user@dummy/repo eins zwei --five fuenf
   eins zwei None None None
 
+Explicitly kill daemons to let the test exit on Windows
+
+  $ "$TESTDIR/killdaemons.py" $DAEMON_PIDS
+