[PATCH] tests: remove last two check-code warnings about killdaemons

Kevin Bullock kbullock+mercurial at ringworld.org
Sat Feb 9 08:04:06 CST 2013


# HG changeset patch
# User Kevin Bullock <kbullock at ringworld.org>
# Date 1360418293 0
# Node ID c99f13e430f9f52c702f125a8b7aa197bef71a7a
# Parent  1cb04715fd4bb12bc5f3fd52a6b055201e704059
tests: remove last two check-code warnings about killdaemons

Removes the last of the warnings in test-check-code-hg.t introduced in
667063b22a69.

diff --git a/tests/test-check-code-hg.t b/tests/test-check-code-hg.t
--- a/tests/test-check-code-hg.t
+++ b/tests/test-check-code-hg.t
@@ -11,10 +11,3 @@ New errors are not allowed. Warnings are
   $ 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]
diff --git a/tests/test-serve.t b/tests/test-serve.t
--- a/tests/test-serve.t
+++ b/tests/test-serve.t
@@ -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


More information about the Mercurial-devel mailing list