tests: remove last two check-code warnings about killdaemons
authorKevin Bullock <kbullock@ringworld.org>
Sat, 09 Feb 2013 13:58:13 +0000
changeset 18602 339a3fa19695
parent 18601 ce844e8e8af2
child 18607 26627c30735a
tests: remove last two check-code warnings about killdaemons Removes the last of the warnings in test-check-code-hg.t introduced in 667063b22a69.
tests/test-check-code-hg.t
tests/test-serve.t
--- a/tests/test-check-code-hg.t	Sat Feb 09 13:35:45 2013 +0000
+++ b/tests/test-check-code-hg.t	Sat Feb 09 13:58:13 2013 +0000
@@ -11,10 +11,3 @@
   $ hg manifest 2>/dev/null \
   >   | xargs "$check_code" --warnings --nolineno --per-file=0 \
   >   || false
-  tests/test-serve.t:0:
-   >   >        kill `cat hg.pid`
-   don't use kill, use killdaemons.py
-  tests/test-serve.t:0:
-   >   >        kill `cat hg.pid` 2>/dev/null
-   don't use kill, use killdaemons.py
-  [1]
--- a/tests/test-serve.t	Sat Feb 09 13:35:45 2013 +0000
+++ b/tests/test-serve.t	Sat Feb 09 13:58:13 2013 +0000
@@ -9,12 +9,7 @@
   >    cat hg.pid >> "$DAEMON_PIDS"
   >    echo % errors
   >    cat errors.log
-  >    if [ "$KILLQUIETLY" = "Y" ]; then
-  >        kill `cat hg.pid` 2>/dev/null
-  >    else
-  >        kill `cat hg.pid`
-  >    fi
-  >    while kill -0 `cat hg.pid` 2>/dev/null; do sleep 0; done
+  >    "$TESTDIR/killdaemons.py" hg.pid
   > }
 
   $ hg init test