From: Victor Stinner <victor.stinner@haypocalc.com>
Date: Wed, 22 Jun 2011 19:28:43 +0000 (+0200)
Subject: Issue #12383: fix test_empty_env() of subprocess on Mac OS X
X-Git-Tag: v3.2.1rc2~66
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=237e5cb3767aece25e616fb41172836bb4f31760;p=thirdparty%2FPython%2Fcpython.git

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.
---

diff --git a/Lib/test/test_subprocess.py b/Lib/test/test_subprocess.py
index 8444d6a5170f..23325f49eebb 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",