summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@haypocalc.com>2011-06-22 19:28:43 (GMT)
committerVictor Stinner <victor.stinner@haypocalc.com>2011-06-22 19:28:43 (GMT)
commit237e5cb3767aece25e616fb41172836bb4f31760 (patch)
tree83acee9f62c56cb76c6dc89a8b462b87846df754 /Lib
parent372309a5518cf8eedba32e1ee5819fa207b44af4 (diff)
downloadcpython-237e5cb3767aece25e616fb41172836bb4f31760.zip
cpython-237e5cb3767aece25e616fb41172836bb4f31760.tar.gz
cpython-237e5cb3767aece25e616fb41172836bb4f31760.tar.bz2
Issue #12383: fix test_empty_env() of subprocess on Mac OS X
Mac OS X adds __CF_USER_TEXT_ENCODING variable to an empty environment. Fix also the test on the Py_ENABLE_SHARED config varible: test that the variable is present, don't check it's value.
Diffstat (limited to 'Lib')
-rw-r--r--Lib/test/test_subprocess.py8
1 files changed, 6 insertions, 2 deletions
diff --git a/Lib/test/test_subprocess.py b/Lib/test/test_subprocess.py
index 8444d6a..23325f4 100644
--- a/Lib/test/test_subprocess.py
+++ b/Lib/test/test_subprocess.py
@@ -339,7 +339,7 @@ class ProcessTestCase(BaseTestCase):
stdout, stderr = p.communicate()
self.assertEqual(stdout, b"orange")
- @unittest.skipIf(sysconfig.get_config_var('Py_ENABLE_SHARED') == 1,
+ @unittest.skipIf(sysconfig.get_config_var('Py_ENABLE_SHARED') is not None,
'the python library cannot be loaded '
'with an empty environment')
def test_empty_env(self):
@@ -349,7 +349,11 @@ class ProcessTestCase(BaseTestCase):
stdout=subprocess.PIPE,
env={}) as p:
stdout, stderr = p.communicate()
- self.assertEqual(stdout.strip(), b"[]")
+ self.assertIn(stdout.strip(),
+ (b"[]",
+ # Mac OS X adds __CF_USER_TEXT_ENCODING variable to an empty
+ # environment
+ b"['__CF_USER_TEXT_ENCODING']"))
def test_communicate_stdin(self):
p = subprocess.Popen([sys.executable, "-c",