test-inotify.t: migrate to killdaemons from kill `cat pidfile`

tests/test-check-code-hg.t

@@ -1,32 +1,23 b''
   $ check_code="$TESTDIR"/../contrib/check-code.py
   $ cd "$TESTDIR"/..
   $ if hg identify -q > /dev/null; then :
   > else
   >     echo "skipped: not a Mercurial working dir" >&2
   >     exit 80
   > fi
 
 New errors are not allowed. Warnings are strongly discouraged.
 
   $ hg manifest | xargs "$check_code" --warnings --nolineno --per-file=0 \
   > || false
-  tests/test-inotify.t:0:
-   >   $ kill `cat ../hg2.pid`
-   don't use kill, use killdaemons.py
-  tests/test-inotify.t:0:
-   >   $ kill `cat hg.pid`
-   don't use kill, use killdaemons.py
-  tests/test-inotify.t:0:
-   >   $ kill `cat hg3.pid`
-   don't use kill, use killdaemons.py
   tests/test-obsolete.t:0:
    >   $ kill `cat hg.pid`
    don't use kill, use killdaemons.py
    don't use kill, use killdaemons.py
   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]

tests/test-inotify.t

@@ -1,182 +1,182 b''
 
   $ "$TESTDIR/hghave" inotify || exit 80
   $ hg init repo1
   $ cd repo1
   $ touch a b c d e
   $ mkdir dir
   $ mkdir dir/bar
   $ touch dir/x dir/y dir/bar/foo
   $ hg ci -Am m
   adding a
   adding b
   adding c
   adding d
   adding dir/bar/foo
   adding dir/x
   adding dir/y
   adding e
   $ cd ..
   $ hg clone repo1 repo2
   updating to branch default
   8 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ echo "[extensions]" >> $HGRCPATH
   $ echo "inotify=" >> $HGRCPATH
   $ cd repo2
   $ echo b >> a
 
 check that daemon started automatically works correctly
 and make sure that inotify.pidfile works
 
   $ hg --config "inotify.pidfile=../hg2.pid" status
   M a
 
 make sure that pidfile worked. Output should be silent.
 
-  $ kill `cat ../hg2.pid`
+  $ "$TESTDIR/killdaemons.py" ../hg2.pid
   $ cd ../repo1
 
 inserve
 
   $ hg inserve -d --pid-file=hg.pid
   $ cat hg.pid >> "$DAEMON_PIDS"
 
 let the daemon finish its stuff
 
   $ sleep 1
 
 cannot start, already bound
 
   $ hg inserve
   abort: inotify-server: cannot start: socket is already bound
   [255]
 
 issue907
 
   $ hg status
   ? hg.pid
 
 clean
 
   $ hg status -c
   C a
   C b
   C c
   C d
   C dir/bar/foo
   C dir/x
   C dir/y
   C e
 
 all
 
   $ hg status -A
   ? hg.pid
   C a
   C b
   C c
   C d
   C dir/bar/foo
   C dir/x
   C dir/y
   C e
 
 path patterns
 
   $ echo x > dir/x
   $ hg status .
   M dir/x
   ? hg.pid
   $ hg status dir
   M dir/x
   $ cd dir
   $ hg status .
   M x
   $ cd ..
 
 issue 1375
 testing that we can remove a folder and then add a file with the same name
 issue 1375
 
   $ mkdir h
   $ echo h > h/h
   $ hg ci -Am t
   adding h/h
   adding hg.pid
   $ hg rm h
   removing h/h
   $ echo h >h
   $ hg add h
   $ hg status
   A h
   R h/h
   $ hg ci -m0
 
 Test for issue1735: inotify watches files in .hg/merge
 
   $ hg st
   $ echo a > a
   $ hg ci -Am a
   $ hg st
   $ echo b >> a
   $ hg ci -m ab
   $ hg st
   $ echo c >> a
   $ hg st
   M a
   $ HGMERGE=internal:local hg up 0
   1 files updated, 1 files merged, 2 files removed, 0 files unresolved
   $ hg st
   M a
   $ HGMERGE=internal:local hg up
   3 files updated, 1 files merged, 0 files removed, 0 files unresolved
   $ hg st
   M a
 
 Test for 1844: "hg ci folder" will not commit all changes beneath "folder"
 
   $ mkdir 1844
   $ echo a > 1844/foo
   $ hg add 1844
   adding 1844/foo
   $ hg ci -m 'working'
   $ echo b >> 1844/foo
   $ hg ci 1844 -m 'broken'
 
 Test for issue884: "Build products not ignored until .hgignore is touched"
 
   $ echo '^build$' > .hgignore
   $ hg add .hgignore
   $ hg ci .hgignore -m 'ignorelist'
 
 Now, lets add some build products...
 
   $ mkdir build
   $ touch build/x
   $ touch build/y
 
 build/x & build/y shouldn't appear in "hg st"
 
   $ hg st
-  $ kill `cat hg.pid`
+  $ "$TESTDIR/killdaemons.py" hg.pid
 
   $ cd ..
 
 Ensure that if the repo is in a directory whose name is too long, the
 unix domain socket is reached through a symlink (issue1208).
 
   $ mkdir 0_3456789_10_456789_20_456789_30_456789_40_456789_50_45678_
   $ cd 0_3456789_10_456789_20_456789_30_456789_40_456789_50_45678_
   $ mkdir 60_456789_70_456789_80_456789_90_456789_100_56789_
   $ cd 60_456789_70_456789_80_456789_90_456789_100_56789_
 
   $ hg --config inotify.pidfile=hg3.pid clone -q ../../repo1
   $ readlink repo1/.hg/inotify.sock
   */inotify.sock (glob)
 
 Trying to start the server a second time should fail as usual.
 
   $ hg --cwd repo1 inserve
   abort: inotify-server: cannot start: socket is already bound
   [255]
 
-  $ kill `cat hg3.pid`
+  $ "$TESTDIR/killdaemons.py" hg3.pid