* ``FakeProcess`` wait() now supports arguments added in Python 3.

  (Steve Kowalik)

3 files changed, 8 insertions, 1 deletions

diff --git a/NEWS b/NEWS
index 92b8e05..864f687 100644
--- a/NEWS
+++ b/NEWS
@@ -14,6 +14,9 @@ CHANGES
 
 * ``FakeProcess`` now supports kill(). (Steve Kowalik)
 
+* ``FakeProcess`` wait() now supports arguments added in Python 3.
+  (Steve Kowalik)
+
 * ``MonkeyPatch`` now preserves ``staticmethod`` functions.
   (Dan Kenigsberg)
 
diff --git a/lib/fixtures/_fixtures/popen.py b/lib/fixtures/_fixtures/popen.py
index 67f20e3..728e980 100644
--- a/lib/fixtures/_fixtures/popen.py
+++ b/lib/fixtures/_fixtures/popen.py
@@ -57,7 +57,7 @@ class FakeProcess(object):
     def kill(self):
         pass
 
-    def wait(self):
+    def wait(self, timeout=None, endtime=None):
         if self.returncode is None:
             self.communicate()
         return self.returncode
diff --git a/lib/fixtures/tests/_fixtures/test_popen.py b/lib/fixtures/tests/_fixtures/test_popen.py
index 6d47291..98b762f 100644
--- a/lib/fixtures/tests/_fixtures/test_popen.py
+++ b/lib/fixtures/tests/_fixtures/test_popen.py
@@ -98,3 +98,7 @@ class TestFakeProcess(testtools.TestCase):
     def test_kill(self):
         proc = FakeProcess({}, {})
         self.assertIs(None, proc.kill())
+
+    def test_wait_with_timeout_and_endtime(self):
+        proc = FakeProcess({}, {})
+        self.assertEqual(0 , proc.wait(timeout=4, endtime=7))