changeset 18588:3241fc65e3cd

test-https.t: stop using kill `cat $pidfile`
author Augie Fackler <raf@durin42.com>
date Sat, 09 Feb 2013 05:26:16 -0600
parents cbf5f3eb9d13
children 91aac2797c40
files tests/test-check-code-hg.t tests/test-https.t
diffstat 2 files changed, 3 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/tests/test-check-code-hg.t	Sat Feb 09 06:07:32 2013 -0600
+++ b/tests/test-check-code-hg.t	Sat Feb 09 05:26:16 2013 -0600
@@ -14,9 +14,6 @@
    >   $ while kill `cat hg.pid` 2>/dev/null; do sleep 0; done
    don't use kill, use killdaemons.py
    don't use kill, use killdaemons.py
-  tests/test-https.t:0:
-   >   $ while kill `cat hg1.pid` 2>/dev/null; do sleep 0; done
-   don't use kill, use killdaemons.py
   tests/test-inotify-debuginotify.t:0:
    >   $ kill `cat hg.pid`
    don't use kill, use killdaemons.py
--- a/tests/test-https.t	Sat Feb 09 06:07:32 2013 -0600
+++ b/tests/test-https.t	Sat Feb 09 05:26:16 2013 -0600
@@ -233,11 +233,13 @@
   (check hostfingerprint configuration)
   [255]
 
+
 - ignores that certificate doesn't match hostname
   $ hg -R copy-pull id https://127.0.0.1:$HGPORT/
   5fed3813f7f5
 
-  $ while kill `cat hg1.pid` 2>/dev/null; do sleep 0; done
+HGPORT1 is reused below for tinyproxy tests. Kill that server.
+  $ "$TESTDIR/killdaemons.py" hg1.pid
 
 Prepare for connecting through proxy