From a4722449caccc42ad644611d02fbdb5005f601eb Mon Sep 17 00:00:00 2001 From: =?utf8?q?Filipe=20La=C3=ADns=20=F0=9F=87=B5=F0=9F=87=B8?= Date: Thu, 30 Jan 2025 03:32:24 +0000 Subject: [PATCH] tests: add test.support.venv.VirtualEnvironmentMixin (#129461) --- Lib/test/support/venv.py | 12 ++++++++++++ Lib/test/test_sysconfig.py | 11 ++--------- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/Lib/test/support/venv.py b/Lib/test/support/venv.py index 78e6a51ec181..7bfb9e4f3c47 100644 --- a/Lib/test/support/venv.py +++ b/Lib/test/support/venv.py @@ -6,6 +6,7 @@ import shlex import sys import sysconfig import tempfile +import unittest import venv @@ -68,3 +69,14 @@ class VirtualEnvironment: raise else: return result + + +class VirtualEnvironmentMixin: + def venv(self, name=None, **venv_create_args): + venv_name = self.id() + if name: + venv_name += f'-{name}' + return VirtualEnvironment.from_tmpdir( + prefix=f'{venv_name}-venv-', + **venv_create_args, + ) diff --git a/Lib/test/test_sysconfig.py b/Lib/test/test_sysconfig.py index 3950d8888d4c..3738914cf17d 100644 --- a/Lib/test/test_sysconfig.py +++ b/Lib/test/test_sysconfig.py @@ -20,7 +20,7 @@ from test.support import ( from test.support.import_helper import import_module from test.support.os_helper import (TESTFN, unlink, skip_unless_symlink, change_cwd) -from test.support.venv import VirtualEnvironment +from test.support.venv import VirtualEnvironmentMixin import sysconfig from sysconfig import (get_paths, get_platform, get_config_vars, @@ -37,7 +37,7 @@ import _sysconfig HAS_USER_BASE = sysconfig._HAS_USER_BASE -class TestSysConfig(unittest.TestCase): +class TestSysConfig(unittest.TestCase, VirtualEnvironmentMixin): def setUp(self): super(TestSysConfig, self).setUp() @@ -111,13 +111,6 @@ class TestSysConfig(unittest.TestCase): elif os.path.isdir(path): shutil.rmtree(path) - def venv(self, **venv_create_args): - return VirtualEnvironment.from_tmpdir( - prefix=f'{self.id()}-venv-', - **venv_create_args, - ) - - def test_get_path_names(self): self.assertEqual(get_path_names(), sysconfig._SCHEME_KEYS) -- 2.47.3