Merge lp:~stevenk/python-fixtures/fakeopen-with into lp:~python-fixtures/python-fixtures/trunk

[Steve Kowalik]

Add __enter__() and __exit__() methods to FakeProcess (which is returned by FakePopen) to allow FakePopen to be used within a context manager itself.

=== modified file 'NEWS'
--- NEWS	2013-08-16 03:04:37 +0000
+++ NEWS	2014-08-18 06:16:30 +0000
@@ -6,6 +6,12 @@
 NEXT
 ~~~~
 
+CHANGES
+-------
+
+* ``FakePopen`` now supports being called under a context manager (IE: with).
+  (Steve Kowalik)
+
 0.3.14
 ~~~~~~
 
 
=== modified file 'lib/fixtures/_fixtures/popen.py'
--- lib/fixtures/_fixtures/popen.py	2013-08-16 03:03:08 +0000
+++ lib/fixtures/_fixtures/popen.py	2014-08-18 06:16:30 +0000
@@ -48,6 +48,12 @@
             err = ''
         return out, err
 
+    def __enter__(self):
+        return self
+
+    def __exit__(self, exc_type, exc_value, traceback):
+        self.wait()
+
     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	2013-08-16 03:03:08 +0000
+++ lib/fixtures/tests/_fixtures/test_popen.py	2014-08-18 06:16:30 +0000
@@ -72,6 +72,11 @@
         self.assertEqual(1, proc.wait())
         self.assertEqual(1, proc.returncode)
 
+    def test_with_popen_custom(self):
+        fixture = self.useFixture(FakePopen())
+        with subprocess.Popen(['ls -lh']) as proc:
+            self.assertEqual(None, proc.returncode)
+
 
 class TestFakeProcess(testtools.TestCase):