From b9656509c178041f729cbaa6a1ca974f4b3c6f5d Mon Sep 17 00:00:00 2001 From: Jakub Libosvar Date: Thu, 18 Jun 2015 16:00:56 +0000 Subject: [PATCH] RootHelperProcess: kill can consume signal number The kill() method now accepts a signal parameter. Change-Id: I2eb756a73565d93c979e62eaab358a3a519aa8dd --- neutron/tests/common/net_helpers.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/neutron/tests/common/net_helpers.py b/neutron/tests/common/net_helpers.py index d0e03cb5f..170d1b3a9 100644 --- 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) -- 2.45.2