Merge lp:~stevenk/python-fixtures/fakeprocess-kill into lp:~python-fixtures/python-fixtures/trunk

[Steve Kowalik]

Python 3.3+ may call subprocess.kill() in some cases, so FakeProcess should support that interface.

=== modified file 'NEWS'
--- NEWS	2014-08-19 04:44:18 +0000
+++ NEWS	2014-08-19 04:44:18 +0000
@@ -11,6 +11,7 @@
 
 * ``FakePopen`` now supports being called under a context manager (IE: with).
   (Steve Kowalik)
+* ``FakeProcess`` now supports kill(). (Steve Kowalik)
 
 0.3.14
 ~~~~~~

=== modified file 'lib/fixtures/_fixtures/popen.py'
--- lib/fixtures/_fixtures/popen.py	2014-08-19 04:44:18 +0000
+++ lib/fixtures/_fixtures/popen.py	2014-08-19 04:44:18 +0000
@@ -54,6 +54,9 @@
     def __exit__(self, exc_type, exc_value, traceback):
         self.wait()
 
+    def kill(self):
+        pass
+
     def wait(self):
         if self.returncode is None:
             self.communicate()

=== modified file 'lib/fixtures/tests/_fixtures/test_popen.py'
--- lib/fixtures/tests/_fixtures/test_popen.py	2014-08-19 04:44:18 +0000
+++ lib/fixtures/tests/_fixtures/test_popen.py	2014-08-19 04:44:18 +0000
@@ -94,3 +94,7 @@
         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())