Commit 74c9dd57 authored by Victor Stinner's avatar Victor Stinner Committed by GitHub

bpo-37421: Fix test_distutils.test_build_ext() (GH-14564)

test_distutils.test_build_ext() is now able to remove the temporary
directory on Windows: don't import the newly built C extension ("xx")
in the current process, but test it in a separated process.
parent 684cb47f
......@@ -6,6 +6,7 @@ import tempfile
import unittest
import sysconfig
from copy import deepcopy
import test.support
from distutils import log
from distutils.log import DEBUG, INFO, WARN, ERROR, FATAL
......@@ -64,8 +65,8 @@ class TempdirManager(object):
os.chdir(self.old_cwd)
super().tearDown()
while self.tempdirs:
d = self.tempdirs.pop()
shutil.rmtree(d, os.name in ('nt', 'cygwin'))
tmpdir = self.tempdirs.pop()
test.support.rmtree(tmpdir)
def mkdtemp(self):
"""Create a temporary directory that will be cleaned up.
......
......@@ -15,6 +15,7 @@ from distutils.errors import (
import unittest
from test import support
from test.support.script_helper import assert_python_ok
# http://bugs.python.org/issue4373
# Don't load the xx module more than once.
......@@ -26,11 +27,8 @@ class BuildExtTestCase(TempdirManager,
unittest.TestCase):
def setUp(self):
# Create a simple test environment
# Note that we're making changes to sys.path
super(BuildExtTestCase, self).setUp()
self.tmp_dir = self.mkdtemp()
self.sys_path = sys.path, sys.path[:]
sys.path.append(self.tmp_dir)
import site
self.old_user_base = site.USER_BASE
site.USER_BASE = self.mkdtemp()
......@@ -40,15 +38,11 @@ class BuildExtTestCase(TempdirManager,
# bpo-30132: On Windows, a .pdb file may be created in the current
# working directory. Create a temporary working directory to cleanup
# everything at the end of the test.
self.temp_cwd = support.temp_cwd()
self.temp_cwd.__enter__()
self.addCleanup(self.temp_cwd.__exit__, None, None, None)
change_cwd = support.change_cwd(self.tmp_dir)
change_cwd.__enter__()
self.addCleanup(change_cwd.__exit__, None, None, None)
def tearDown(self):
# Get everything back to normal
support.unload('xx')
sys.path = self.sys_path[0]
sys.path[:] = self.sys_path[1]
import site
site.USER_BASE = self.old_user_base
from distutils.command import build_ext
......@@ -88,8 +82,18 @@ class BuildExtTestCase(TempdirManager,
else:
ALREADY_TESTED = type(self).__name__
code = textwrap.dedent(f"""
tmp_dir = {self.tmp_dir!r}
import sys
import unittest
from test import support
sys.path.insert(0, tmp_dir)
import xx
class Tests(unittest.TestCase):
def test_xx(self):
for attr in ('error', 'foo', 'new', 'roj'):
self.assertTrue(hasattr(xx, attr))
......@@ -102,6 +106,11 @@ class BuildExtTestCase(TempdirManager,
self.assertIsInstance(xx.Null(), xx.Null)
self.assertIsInstance(xx.Str(), xx.Str)
unittest.main()
""")
assert_python_ok('-c', code)
def test_solaris_enable_shared(self):
dist = Distribution({'name': 'xx'})
cmd = self.build_ext(dist)
......
test_distutils.test_build_ext() is now able to remove the temporary
directory on Windows: don't import the newly built C extension ("xx") in the
current process, but test it in a separated process.
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