mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-04 00:48:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

revert r83831, unix test breakage

Browse source
This commit is contained in:
Benjamin Peterson 2010-08-08 19:17:15 +00:00
parent 51d19cf227
commit a0baf55b2b
2 changed files with 5 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

54
Lib/test/test_subprocess.py
View file

@ -28,7 +28,7 @@ def remove_stderr_debug_decorations(stderr):
return re.sub("\[\d+ refs\]\r?\n?$", "", stderr.decode()).encode()
#return re.sub(r"\[\d+ refs\]\r?\n?$", "", stderr)
class BaseTestCase(unittest.TestCase):
class ProcessTestCase(unittest.TestCase):
def setUp(self):
# Try to minimize the number of children we have so this test
# doesn't crash on some buildbots (Alphas in particular).
@ -41,15 +41,14 @@ class BaseTestCase(unittest.TestCase):
if hasattr(support, "reap_children"):
support.reap_children()
def mkstemp(self, *args, **kwargs):
def mkstemp(self):
"""wrapper for mkstemp, calling mktemp if mkstemp is not available"""
if hasattr(tempfile, "mkstemp"):
return tempfile.mkstemp(*args, **kwargs)
return tempfile.mkstemp()
else:
fname = tempfile.mktemp(*args, **kwargs)
fname = tempfile.mktemp()
return os.open(fname, os.O_RDWR|os.O_CREAT), fname
class ProcessTestCase(BaseTestCase):
#
# Generic tests
#
@ -864,7 +863,6 @@ class ProcessTestCase(BaseTestCase):
p.terminate()
self.assertNotEqual(p.wait(), 0)
class CommandTests(unittest.TestCase):
# The module says:
# "NB This only works (and is only relevant) for UNIX."
@ -895,50 +893,6 @@ class CommandTests(unittest.TestCase):
unit_tests = [ProcessTestCase, CommandTests]
if mswindows:
class CommandsWithSpaces (BaseTestCase):
def setUp(self):
super().setUp()
f, fname = self.mkstemp(".py", "te st")
self.fname = fname.lower ()
os.write(f, b"import sys;"
b"sys.stdout.write('%d %s' % (len(sys.argv), [a.lower () for a in sys.argv]))"
)
os.close(f)
def tearDown(self):
os.remove(self.fname)
super().tearDown()
def with_spaces(self, *args, **kwargs):
kwargs['stdout'] = subprocess.PIPE
p = subprocess.Popen(*args, **kwargs)
self.assertEqual(
p.stdout.read ().decode("mbcs"),
"2 [%r, 'ab cd']" % self.fname
)
def test_shell_string_with_spaces(self):
# call() function with string argument with spaces on Windows
self.with_spaces('"%s" "%s"' % (self.fname, "ab cd"), shell=1)
def test_shell_sequence_with_spaces(self):
# call() function with sequence argument with spaces on Windows
self.with_spaces([self.fname, "ab cd"], shell=1)
def test_noshell_string_with_spaces(self):
# call() function with string argument with spaces on Windows
self.with_spaces('"%s" "%s" "%s"' % (sys.executable, self.fname,
"ab cd"))
def test_noshell_sequence_with_spaces(self):
# call() function with sequence argument with spaces on Windows
self.with_spaces([sys.executable, self.fname, "ab cd"])
unit_tests.append(CommandsWithSpaces)
if getattr(subprocess, '_has_poll', False):
class ProcessTestCaseNoPoll(ProcessTestCase):
def setUp(self):