run-tests: do not duplicate killdaemons() code

tests/killdaemons.py

@@ -2,9 +2,12 b''
 
 import os, time, errno, signal
 
+def killdaemons(pidfile, tryhard=True, remove=False, logfn=None):
+    if not logfn:
+        logfn = lambda s: s
 # Kill off any leftover daemon processes
 try:
-    fp = open(os.environ['DAEMON_PIDS'])
+        fp = open(pidfile)
     for line in fp:
         try:
             pid = int(line)
@@ -12,14 +15,26 b' try:'
             continue
         try:
             os.kill(pid, 0)
+                logfn('# Killing daemon process %d' % pid)
             os.kill(pid, signal.SIGTERM)
+                if tryhard:
             for i in range(10):
                 time.sleep(0.05)
                 os.kill(pid, 0)
+                else:
+                    time.sleep(0.1)
+                    os.kill(pid, 0)
+                logfn('# Daemon process %d is stuck - really killing it' % pid)
             os.kill(pid, signal.SIGKILL)
         except OSError, err:
             if err.errno != errno.ESRCH:
                 raise
     fp.close()
+        if remove:
+            os.unlink(pidfile)
 except IOError:
     pass
+
+if __name__ == '__main__':
+    killdaemons(os.environ['DAEMON_PIDS'])
+

tests/run-tests.py

@@ -54,6 +54,7 b' import tempfile'
 import time
 import re
 import threading
+import killdaemons as killmod
 
 processlock = threading.Lock()
 
@@ -348,29 +349,8 b' def terminate(proc):'
         pass
 
 def killdaemons():
-    # Kill off any leftover daemon processes
-    try:
-        fp = open(DAEMON_PIDS)
-        for line in fp:
-            try:
-                pid = int(line)
-            except ValueError:
-                continue
-            try:
-                os.kill(pid, 0)
-                vlog('# Killing daemon process %d' % pid)
-                os.kill(pid, signal.SIGTERM)
-                time.sleep(0.1)
-                os.kill(pid, 0)
-                vlog('# Daemon process %d is stuck - really killing it' % pid)
-                os.kill(pid, signal.SIGKILL)
-            except OSError, err:
-                if err.errno != errno.ESRCH:
-                    raise
-        fp.close()
-        os.unlink(DAEMON_PIDS)
-    except IOError:
-        pass
+    return killmod.killdaemons(DAEMON_PIDS, tryhard=False, remove=True,
+                               logfn=vlog)
 
 def cleanup(options):
     if not options.keep_tmpdir: