diff options
| author | Benjamin Peterson <benjamin@python.org> | 2011-06-01 00:08:12 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2011-06-01 00:08:12 (GMT) |
| commit | bdc21fbaf9dd32b5c140e5ee78575d5465379467 (patch) | |
| tree | 413d772196a33453e7484af54b1a204420d0f792 /Lib/test | |
| parent | 35a9b1ca1347400bb12e2af3d6b38f2549c5d9dc (diff) | |
| parent | e9b185f26318e7ff34bd8ec36a509cd85106d696 (diff) | |
| download | cpython-bdc21fbaf9dd32b5c140e5ee78575d5465379467.zip cpython-bdc21fbaf9dd32b5c140e5ee78575d5465379467.tar.gz cpython-bdc21fbaf9dd32b5c140e5ee78575d5465379467.tar.bz2 | |
merge heads
Diffstat (limited to 'Lib/test')
| -rw-r--r-- | Lib/test/test_subprocess.py | 2 | ||||
| -rw-r--r-- | Lib/test/test_support.py | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/Lib/test/test_subprocess.py b/Lib/test/test_subprocess.py index 73c1b5c..a93602a 100644 --- a/Lib/test/test_subprocess.py +++ b/Lib/test/test_subprocess.py @@ -116,7 +116,7 @@ class ProcessTestCase(BaseTestCase): def test_invalid_args(self): # Popen() called with invalid arguments should raise TypeError # but Popen.__del__ should not complain (issue #12085) - with support.captured_stderr() as s: + with test_support.captured_stderr() as s: self.assertRaises(TypeError, subprocess.Popen, invalid_arg_name=1) argcount = subprocess.Popen.__init__.__code__.co_argcount too_many_args = [0] * (argcount + 1) diff --git a/Lib/test/test_support.py b/Lib/test/test_support.py index 81bb3ca..de56e9e 100644 --- a/Lib/test/test_support.py +++ b/Lib/test/test_support.py @@ -833,6 +833,9 @@ def captured_stdout(): """ return captured_output("stdout") +def captured_stderr(): + return captured_output("stderr") + def captured_stdin(): return captured_output("stdin") |