summaryrefslogtreecommitdiff
path: root/Lib/test/test_subprocess.py
diff options
context:
space:
mode:
authorGregory P. Smith <greg@krypto.org>2011-05-28 09:06:02 -0700
committerGregory P. Smith <greg@krypto.org>2011-05-28 09:06:02 -0700
commitc80504fb6954c8aabc97e79116fd93bb8d55a03c (patch)
treec4be7b00f95f3436b278c61867c8c2dec2bb13f7 /Lib/test/test_subprocess.py
parente4eed06dfa3d508235df147aaac44d0dad017e7a (diff)
downloadcpython-git-c80504fb6954c8aabc97e79116fd93bb8d55a03c.tar.gz
Fix ProcessTestCasePOSIXPurePython to test the module from import when
_posixsubprocess doesn't exist rather than simply stubbing it out after the fact. This adds coverage for the RuntimeWarning as well as using the pure python _create_pipe instead of using _posixsubprocess.cloexec_pipe unintentionally with the pure python code. Ironically: I don't think any platform should ever actually _use_ the pure Python subprocess code on POSIX platforms anymore. This at least tests it properly in this stable branch. The pure python code for this is likely to be removed in 3.3.
Diffstat (limited to 'Lib/test/test_subprocess.py')
-rw-r--r--Lib/test/test_subprocess.py26
1 files changed, 17 insertions, 9 deletions
diff --git a/Lib/test/test_subprocess.py b/Lib/test/test_subprocess.py
index 776e1437c4..08d2653102 100644
--- a/Lib/test/test_subprocess.py
+++ b/Lib/test/test_subprocess.py
@@ -1498,15 +1498,23 @@ class ProcessTestCaseNoPoll(ProcessTestCase):
@unittest.skipUnless(getattr(subprocess, '_posixsubprocess', False),
"_posixsubprocess extension module not found.")
class ProcessTestCasePOSIXPurePython(ProcessTestCase, POSIXProcessTestCase):
- def setUp(self):
- subprocess._posixsubprocess = None
- ProcessTestCase.setUp(self)
- POSIXProcessTestCase.setUp(self)
-
- def tearDown(self):
- subprocess._posixsubprocess = sys.modules['_posixsubprocess']
- POSIXProcessTestCase.tearDown(self)
- ProcessTestCase.tearDown(self)
+ @classmethod
+ def setUpClass(cls):
+ global subprocess
+ assert subprocess._posixsubprocess
+ # Reimport subprocess while forcing _posixsubprocess to not exist.
+ with support.check_warnings(('.*_posixsubprocess .* not being used.*',
+ RuntimeWarning)):
+ subprocess = support.import_fresh_module(
+ 'subprocess', blocked=['_posixsubprocess'])
+ assert not subprocess._posixsubprocess
+
+ @classmethod
+ def tearDownClass(cls):
+ global subprocess
+ # Reimport subprocess as it should be, restoring order to the universe.
+ subprocess = support.import_fresh_module('subprocess')
+ assert subprocess._posixsubprocess
class HelperFunctionTests(unittest.TestCase):