Patchwork [2,of,2] tests: remove last two check-code warnings about killdaemons

login
register
mail settings
Submitter Kevin Bullock
Date Feb. 9, 2013, 2:27 p.m.
Message ID <c99f13e430f9f52c702f.1360420037@s0-0.paconsult7.bbnplanet.net>
Download mbox | patch
Permalink /patch/878/
State Accepted
Commit 339a3fa196955c4753e119062584761d579e80b1
Headers show

Comments

Kevin Bullock - Feb. 9, 2013, 2:27 p.m.
# HG changeset patch
# User Kevin Bullock <kbullock@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.

Patch

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