RootHelperProcess: kill can consume signal number

The kill() method now accepts a signal parameter.

Change-Id: I2eb756a73565d93c979e62eaab358a3a519aa8dd

diff --git a/neutron/tests/common/net_helpers.py b/neutron/tests/common/net_helpers.py
index d0e03cb5febf0b62f37621aa0c6ebfb363261261..170d1b3a9b0798a110f2656c98678ad573077a29 100644 (file)
--- a/neutron/tests/common/net_helpers.py
+++ b/neutron/tests/common/net_helpers.py
@@ -20,6 +20,7 @@ import random
 import re
 import select
 import shlex
+import signal
 import subprocess
 
 import netaddr
@@ -177,9 +178,9 @@ class RootHelperProcess(subprocess.Popen):
         super(RootHelperProcess, self).__init__(cmd, *args, **kwargs)
         self._wait_for_child_process()
 
-    def kill(self):
+    def kill(self, sig=signal.SIGKILL):
         pid = self.child_pid or str(self.pid)
-        utils.execute(['kill', '-9', pid], run_as_root=True)
+        utils.execute(['kill', '-%d' % sig, pid], run_as_root=True)
 
     def read_stdout(self, timeout=None):
         return self._read_stream(self.stdout, timeout)