# HG changeset patch # User Julien Cristau # Date 1363880226 -3600 # Node ID 375acf527559800c137efb640d3cc238d2a0f0ef # Parent 203fb56685ca0b802b631861af6b94dca458c84e [devtools/qunit] don't open-code subprocess.Popen.terminate diff -r 203fb56685ca -r 375acf527559 devtools/qunit.py --- a/devtools/qunit.py Thu Mar 21 16:01:05 2013 +0100 +++ b/devtools/qunit.py Thu Mar 21 16:37:06 2013 +0100 @@ -17,7 +17,6 @@ # with CubicWeb. If not, see . import os, os.path as osp -import signal from tempfile import mkdtemp, NamedTemporaryFile, TemporaryFile import tempfile from Queue import Queue, Empty @@ -80,7 +79,7 @@ ' Are you sure "%s" is a valid home for user "%s"' % (home, user) check_call(self.firefox_cmd + ['-CreateProfile', '%s %s' % (self._profile_name, self._tmp_dir)], - stdout=stdout, stderr=stderr) + stdout=stdout, stderr=stderr) except CalledProcessError as cpe: stdout.seek(0) stderr.seek(0) @@ -95,7 +94,7 @@ def stop(self): if self._process is not None: assert self._process.returncode is None, self._process.returncode - os.kill(self._process.pid, signal.SIGTERM) + self._process.terminate() self._process.wait() self._process = None