utilize subprocess.DEVNULL

This commit is contained in:
Philip Jenvey 2012-10-01 11:48:46 -07:00
parent a3d6538c12
commit 075bbb176f
1 changed files with 19 additions and 21 deletions

View File

@ -305,14 +305,13 @@ class TestSysConfig(unittest.TestCase):
if 'MACOSX_DEPLOYMENT_TARGET' in env: if 'MACOSX_DEPLOYMENT_TARGET' in env:
del env['MACOSX_DEPLOYMENT_TARGET'] del env['MACOSX_DEPLOYMENT_TARGET']
with open('/dev/null', 'w') as devnull_fp: p = subprocess.Popen([
p = subprocess.Popen([ sys.executable, '-c',
sys.executable, '-c', 'import sysconfig; print(sysconfig.get_platform())',
'import sysconfig; print(sysconfig.get_platform())', ],
], stdout=subprocess.PIPE,
stdout=subprocess.PIPE, stderr=subprocess.DEVNULL,
stderr=devnull_fp, env=env)
env=env)
test_platform = p.communicate()[0].strip() test_platform = p.communicate()[0].strip()
test_platform = test_platform.decode('utf-8') test_platform = test_platform.decode('utf-8')
status = p.wait() status = p.wait()
@ -325,20 +324,19 @@ class TestSysConfig(unittest.TestCase):
env = os.environ.copy() env = os.environ.copy()
env['MACOSX_DEPLOYMENT_TARGET'] = '10.1' env['MACOSX_DEPLOYMENT_TARGET'] = '10.1'
with open('/dev/null') as dev_null: p = subprocess.Popen([
p = subprocess.Popen([ sys.executable, '-c',
sys.executable, '-c', 'import sysconfig; print(sysconfig.get_platform())',
'import sysconfig; print(sysconfig.get_platform())', ],
], stdout=subprocess.PIPE,
stdout=subprocess.PIPE, stderr=subprocess.DEVNULL,
stderr=dev_null, env=env)
env=env) test_platform = p.communicate()[0].strip()
test_platform = p.communicate()[0].strip() test_platform = test_platform.decode('utf-8')
test_platform = test_platform.decode('utf-8') status = p.wait()
status = p.wait()
self.assertEqual(status, 0) self.assertEqual(status, 0)
self.assertEqual(my_platform, test_platform) self.assertEqual(my_platform, test_platform)
def test_srcdir(self): def test_srcdir(self):
# See Issues #15322, #15364. # See Issues #15322, #15364.