Kaydet (Commit) 33a5d40d authored tarafından Victor Stinner's avatar Victor Stinner Kaydeden (comit) GitHub

bpo-30108: Restore sys.path in test_site (#1197) (#1378)

Add setUpModule() and tearDownModule() functions to test_site to
save/restore sys.path at the module level to prevent warning if the
user site directory is created, since site.addsitedir() modifies
sys.path.
(cherry picked from commit b85c1369)
üst 809101f1
...@@ -27,14 +27,27 @@ if sys.flags.no_site: ...@@ -27,14 +27,27 @@ if sys.flags.no_site:
import site import site
if site.ENABLE_USER_SITE and not os.path.isdir(site.USER_SITE):
# need to add user site directory for tests OLD_SYS_PATH = None
try:
os.makedirs(site.USER_SITE)
site.addsitedir(site.USER_SITE) def setUpModule():
except PermissionError as exc: global OLD_SYS_PATH
raise unittest.SkipTest('unable to create user site directory (%r): %s' OLD_SYS_PATH = sys.path[:]
% (site.USER_SITE, exc))
if site.ENABLE_USER_SITE and not os.path.isdir(site.USER_SITE):
# need to add user site directory for tests
try:
os.makedirs(site.USER_SITE)
# modify sys.path: will be restored by tearDownModule()
site.addsitedir(site.USER_SITE)
except PermissionError as exc:
raise unittest.SkipTest('unable to create user site directory (%r): %s'
% (site.USER_SITE, exc))
def tearDownModule():
sys.path[:] = OLD_SYS_PATH
class HelperFunctionsTests(unittest.TestCase): class HelperFunctionsTests(unittest.TestCase):
......
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