[pull] main from pypa:main

pyproject.toml

@@ -62,7 +62,7 @@ test = [
     "pytest-subket",
     "scripttest",
     "setuptools",
-    "virtualenv >= 20.0",
+    "virtualenv >= 20.0.28",
     "werkzeug",
     "tomli-w",
     "proxy.py",

tests/lib/test_lib.py

@@ -1,6 +1,7 @@
 """Test the test support."""
 
 import filecmp
+import logging
 import pathlib
 import re
 import sys
@@ -18,6 +19,7 @@
     create_basic_wheel_for_package,
     create_test_package_with_setup,
 )
+from tests.lib.venv import VirtualEnvironment
 
 
 @contextmanager
@@ -33,6 +35,19 @@ def assert_error_startswith(
     assert str(err.value).startswith(expected_start), f"full message: {err.value}"
 
 
+def test_virtualenv_creation_preserves_logging(tmp_path: pathlib.Path) -> None:
+    logger = logging.getLogger()
+    level = logger.level
+    handlers = logger.handlers[:]
+    try:
+        VirtualEnvironment(tmp_path / "venv")
+        assert logger.level == level
+        assert logger.handlers == handlers
+    finally:
+        logger.setLevel(level)
+        logger.handlers[:] = handlers
+
+
 def test_tmp_dir_exists_in_env(script: PipTestEnvironment) -> None:
     """
     Test that $TMPDIR == env.temp_path and path exists and env.assert_no_temp()

tests/lib/venv.py

@@ -73,6 +73,7 @@ def _create(self, clear: bool = False) -> None:
                         "--no-setuptools",
                         os.fspath(self.location),
                     ],
+                    setup_logging=False,
                 )
             elif self._venv_type == "venv":
                 builder = _venv.EnvBuilder()

tests/unit/test_base_command.py

@@ -26,6 +26,15 @@
 from pip._internal.utils.temp_dir import TempDirectory
 
 
+@pytest.fixture(autouse=True)
+def restore_logging_level() -> Iterator[None]:
+    """Restore the root level after a command configures logging."""
+    logger = logging.getLogger()
+    level = logger.level
+    yield
+    logger.setLevel(level)
+
+
 @pytest.fixture
 def fixed_time() -> Iterator[None]:
     # Patch time so logs contain a constant timestamp. time.time_ns is used by

tests/unit/test_utils.py

@@ -286,11 +286,11 @@ def test_rmtree_skips_nonexistent_directory() -> None:
 
 class Failer:
     def __init__(self, duration: int = 1) -> None:
-        self.succeed_after = time.time() + duration
+        self.succeed_after = time.perf_counter() + duration
 
     def call(self, *args: Any, **kw: Any) -> None:
-        """Fail with OSError self.max_fails times"""
-        if time.time() < self.succeed_after:
+        """Fail until the retry fixture's deadline."""
+        if time.perf_counter() < self.succeed_after:
             raise OSError("Failed")