[Python-checkins] bpo-27807: Skip test_site.test_startup_imports() if pth file (GH-19060)
Victor Stinner
webhook-mailer at python.org
Wed Mar 18 13:27:52 EDT 2020
https://github.com/python/cpython/commit/d18de46117d661a4acaf2380cc5ebb1cf6a000e9
commit: d18de46117d661a4acaf2380cc5ebb1cf6a000e9
branch: master
author: Victor Stinner <vstinner at python.org>
committer: GitHub <noreply at github.com>
date: 2020-03-18T18:27:32+01:00
summary:
bpo-27807: Skip test_site.test_startup_imports() if pth file (GH-19060)
test_site.test_startup_imports() is now skipped if a path of sys.path
contains a .pth file.
Sort test_site imports.
files:
A Misc/NEWS.d/next/Tests/2020-03-18-16-04-33.bpo-27807.9gKjET.rst
M Lib/test/test_site.py
diff --git a/Lib/test/test_site.py b/Lib/test/test_site.py
index 6a95e33b4a954..12e357cd9ba69 100644
--- a/Lib/test/test_site.py
+++ b/Lib/test/test_site.py
@@ -10,16 +10,17 @@
from test.support import (captured_stderr, TESTFN, EnvironmentVarGuard,
change_cwd)
import builtins
+import encodings
+import glob
import os
-import sys
import re
-import encodings
-import urllib.request
-import urllib.error
import shutil
import subprocess
+import sys
import sysconfig
import tempfile
+import urllib.error
+import urllib.request
from unittest import mock
from copy import copy
@@ -519,6 +520,23 @@ def test_license_exists_at_url(self):
class StartupImportTests(unittest.TestCase):
def test_startup_imports(self):
+ # Get sys.path in isolated mode (python3 -I)
+ popen = subprocess.Popen([sys.executable, '-I', '-c',
+ 'import sys; print(repr(sys.path))'],
+ stdout=subprocess.PIPE,
+ encoding='utf-8')
+ stdout = popen.communicate()[0]
+ self.assertEqual(popen.returncode, 0, repr(stdout))
+ isolated_paths = eval(stdout)
+
+ # bpo-27807: Even with -I, the site module executes all .pth files
+ # found in sys.path (see site.addpackage()). Skip the test if at least
+ # one .pth file is found.
+ for path in isolated_paths:
+ pth_files = glob.glob(os.path.join(path, "*.pth"))
+ if pth_files:
+ self.skipTest(f"found {len(pth_files)} .pth files in: {path}")
+
# This tests checks which modules are loaded by Python when it
# initially starts upon startup.
popen = subprocess.Popen([sys.executable, '-I', '-v', '-c',
@@ -527,6 +545,7 @@ def test_startup_imports(self):
stderr=subprocess.PIPE,
encoding='utf-8')
stdout, stderr = popen.communicate()
+ self.assertEqual(popen.returncode, 0, (stdout, stderr))
modules = eval(stdout)
self.assertIn('site', modules)
diff --git a/Misc/NEWS.d/next/Tests/2020-03-18-16-04-33.bpo-27807.9gKjET.rst b/Misc/NEWS.d/next/Tests/2020-03-18-16-04-33.bpo-27807.9gKjET.rst
new file mode 100644
index 0000000000000..3749a747c84b3
--- /dev/null
+++ b/Misc/NEWS.d/next/Tests/2020-03-18-16-04-33.bpo-27807.9gKjET.rst
@@ -0,0 +1,2 @@
+``test_site.test_startup_imports()`` is now skipped if a path of
+:data:`sys.path` contains a ``.pth`` file.
More information about the Python-checkins
mailing list