Commit b351248c authored by Gregory P. Smith's avatar Gregory P. Smith Committed by GitHub

bpo-12383: Refactor subprocess test_empty_env (#1874)

Bugfix: This test wasn't being run because it was skipping based on the
presence of Py_ENABLE_SHARED rather than its value.  It is always present
on POSIX systems but defaults to 0.

Refactoring: Move the environment variables that can be ignored into a
function.  Parse the list from the child process and filter out the ones
to exclude in the parent before checking that the rest is empty.

Feature: Adds always present environment variables to ignore when
running in a Gentoo sandbox so that the test can pass there.
parent 9c972b57
...@@ -630,21 +630,29 @@ class ProcessTestCase(BaseTestCase): ...@@ -630,21 +630,29 @@ class ProcessTestCase(BaseTestCase):
# Python # Python
@unittest.skipIf(sys.platform == 'win32', @unittest.skipIf(sys.platform == 'win32',
'cannot test an empty env on Windows') 'cannot test an empty env on Windows')
@unittest.skipIf(sysconfig.get_config_var('Py_ENABLE_SHARED') is not None, @unittest.skipIf(sysconfig.get_config_var('Py_ENABLE_SHARED') == 1,
'the python library cannot be loaded ' 'The Python shared library cannot be loaded '
'with an empty environment') 'with an empty environment.')
def test_empty_env(self): def test_empty_env(self):
"""Verify that env={} is as empty as possible."""
def is_env_var_to_ignore(var_name):
"""Determine if an environment variable is under our control."""
# This excludes some __CF_* and VERSIONER_* keys MacOS insists
# on adding even when the environment in exec is empty.
# Gentoo sandboxes also force LD_PRELOAD and SANDBOX_* to exist.
return ('VERSIONER' in k or '__CF' in k or # MacOS
k == 'LD_PRELOAD' or k.startswith('SANDBOX')) # Gentoo
with subprocess.Popen([sys.executable, "-c", with subprocess.Popen([sys.executable, "-c",
'import os; ' 'import os; print(list(os.environ.keys()))'],
'print(list(os.environ.keys()))'], stdout=subprocess.PIPE, env={}) as p:
stdout=subprocess.PIPE,
env={}) as p:
stdout, stderr = p.communicate() stdout, stderr = p.communicate()
self.assertIn(stdout.strip(), child_env_names = eval(stdout.strip())
(b"[]", self.assertIsInstance(child_env_names, list)
# Mac OS X adds __CF_USER_TEXT_ENCODING variable to an empty child_env_names = [k for k in child_env_names
# environment if not is_env_var_to_ignore(k)]
b"['__CF_USER_TEXT_ENCODING']")) self.assertEqual(child_env_names, [])
def test_communicate_stdin(self): def test_communicate_stdin(self):
p = subprocess.Popen([sys.executable, "-c", p = subprocess.Popen([sys.executable, "-c",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment