mirror of
https://github.com/python/cpython.git
synced 2025-08-04 00:48:58 +00:00
bpo-35978: Correctly skips venv tests in venvs (GH-12220)
Also fixes venvs from the build directory on Windows.
This commit is contained in:
parent
7ee88bf3e5
commit
8bba81fd55
2 changed files with 22 additions and 12 deletions
|
@ -24,8 +24,12 @@ try:
|
|||
except ImportError:
|
||||
ctypes = None
|
||||
|
||||
skipInVenv = unittest.skipIf(sys.prefix != sys.base_prefix,
|
||||
'Test not appropriate in a venv')
|
||||
# Platforms that set sys._base_executable can create venvs from within
|
||||
# another venv, so no need to skip tests that require venv.create().
|
||||
requireVenvCreate = unittest.skipUnless(
|
||||
hasattr(sys, '_base_executable')
|
||||
or sys.prefix == sys.base_prefix,
|
||||
'cannot run venv.create from within a venv on this platform')
|
||||
|
||||
def check_output(cmd, encoding=None):
|
||||
p = subprocess.Popen(cmd,
|
||||
|
@ -126,7 +130,7 @@ class BasicTest(BaseTest):
|
|||
self.assertEqual(context.prompt, '(My prompt) ')
|
||||
self.assertIn("prompt = 'My prompt'\n", data)
|
||||
|
||||
@skipInVenv
|
||||
@requireVenvCreate
|
||||
def test_prefixes(self):
|
||||
"""
|
||||
Test that the prefix values are as expected.
|
||||
|
@ -262,7 +266,7 @@ class BasicTest(BaseTest):
|
|||
# run the test, the pyvenv.cfg in the venv created in the test will
|
||||
# point to the venv being used to run the test, and we lose the link
|
||||
# to the source build - so Python can't initialise properly.
|
||||
@skipInVenv
|
||||
@requireVenvCreate
|
||||
def test_executable(self):
|
||||
"""
|
||||
Test that the sys.executable value is as expected.
|
||||
|
@ -306,6 +310,7 @@ class BasicTest(BaseTest):
|
|||
)
|
||||
self.assertEqual(out.strip(), '0')
|
||||
|
||||
@requireVenvCreate
|
||||
def test_multiprocessing(self):
|
||||
"""
|
||||
Test that the multiprocessing is able to spawn.
|
||||
|
@ -319,7 +324,7 @@ class BasicTest(BaseTest):
|
|||
'print(Pool(1).apply_async("Python".lower).get(3))'])
|
||||
self.assertEqual(out.strip(), "python".encode())
|
||||
|
||||
@skipInVenv
|
||||
@requireVenvCreate
|
||||
class EnsurePipTest(BaseTest):
|
||||
"""Test venv module installation of pip."""
|
||||
def assert_pip_not_installed(self):
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue