summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Collins <robertc@robertcollins.net>2014-08-22 14:46:10 +1200
committerRobert Collins <robertc@robertcollins.net>2014-08-22 14:46:10 +1200
commit8dbefec6563cb4d073fc5aa68d4ed760f68863e1 (patch)
tree808ae197fb926f0130714f02f8e4ab978b3588ff
parent1777cf19bf816bb9d3cc054ad502954ae3a0a65c (diff)
parent99783173a93b0e9705b4dd7f20af7c3337620e82 (diff)
downloadfixtures-8dbefec6563cb4d073fc5aa68d4ed760f68863e1.tar.gz
* ``FakeProcess`` now supports kill(). (Steve Kowalik)
-rw-r--r--NEWS2
-rw-r--r--lib/fixtures/_fixtures/popen.py3
-rw-r--r--lib/fixtures/tests/_fixtures/test_popen.py4
3 files changed, 9 insertions, 0 deletions
diff --git a/NEWS b/NEWS
index 31af1aa..92b8e05 100644
--- a/NEWS
+++ b/NEWS
@@ -12,6 +12,8 @@ CHANGES
* ``FakePopen`` now supports being called under a context manager (IE: with).
(Steve Kowalik)
+* ``FakeProcess`` now supports kill(). (Steve Kowalik)
+
* ``MonkeyPatch`` now preserves ``staticmethod`` functions.
(Dan Kenigsberg)
diff --git a/lib/fixtures/_fixtures/popen.py b/lib/fixtures/_fixtures/popen.py
index 80629fd..67f20e3 100644
--- a/lib/fixtures/_fixtures/popen.py
+++ b/lib/fixtures/_fixtures/popen.py
@@ -54,6 +54,9 @@ class FakeProcess(object):
def __exit__(self, exc_type, exc_value, traceback):
self.wait()
+ def kill(self):
+ pass
+
def wait(self):
if self.returncode is None:
self.communicate()
diff --git a/lib/fixtures/tests/_fixtures/test_popen.py b/lib/fixtures/tests/_fixtures/test_popen.py
index 8eb0174..6d47291 100644
--- a/lib/fixtures/tests/_fixtures/test_popen.py
+++ b/lib/fixtures/tests/_fixtures/test_popen.py
@@ -94,3 +94,7 @@ class TestFakeProcess(testtools.TestCase):
proc = FakeProcess({}, {'stdout': BytesIO(_b('foo'))})
self.assertEqual((_b('foo'), ''), proc.communicate())
self.assertEqual(0, proc.returncode)
+
+ def test_kill(self):
+ proc = FakeProcess({}, {})
+ self.assertIs(None, proc.kill())