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

      (Steve Kowalik)

3 files changed, 7 insertions, 1 deletions

diff --git a/NEWS b/NEWS
index e34391d..0cc10dc 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)
+* ``FakeProcess`` wait() now supports arguments added in Python 3.
+  (Steve Kowalik)
 
 0.3.14
 ~~~~~~
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))