[Python-checkins] bpo-36160: Fix test_site so that it can run independently of other tests (GH-12131) (GH-26263)

iritkatriel webhook-mailer at python.org
Thu May 20 06:42:00 EDT 2021


https://github.com/python/cpython/commit/b9258b03b864520525176f927156b85a532a9d7c
commit: b9258b03b864520525176f927156b85a532a9d7c
branch: 3.9
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: iritkatriel <iritkatriel at yahoo.com>
date: 2021-05-20T11:41:43+01:00
summary:

bpo-36160: Fix test_site so that it can run independently of other tests (GH-12131) (GH-26263)

(cherry picked from commit 1270ad6ec8fe1f71e7d88086474f96f99670ac3a)

Co-authored-by: native-api <vano at mail.mipt.ru>

files:
M Lib/test/test_site.py

diff --git a/Lib/test/test_site.py b/Lib/test/test_site.py
index 5a3bd1828eb56..3d25d7e473f95 100644
--- a/Lib/test/test_site.py
+++ b/Lib/test/test_site.py
@@ -76,8 +76,10 @@ def tearDown(self):
         site.USER_SITE = self.old_site
         site.PREFIXES = self.old_prefixes
         sysconfig._CONFIG_VARS = self.original_vars
-        sysconfig._CONFIG_VARS.clear()
-        sysconfig._CONFIG_VARS.update(self.old_vars)
+        # _CONFIG_VARS is None before get_config_vars() is called
+        if sysconfig._CONFIG_VARS is not None:
+            sysconfig._CONFIG_VARS.clear()
+            sysconfig._CONFIG_VARS.update(self.old_vars)
 
     def test_makepath(self):
         # Test makepath() have an absolute path for its first return value



More information about the Python-checkins mailing list