Refactor get_created_direct_url test

Author: sbidoul

tests/functional/test_freeze.py

@@ -24,7 +24,6 @@
     need_svn,
     wheel,
 )
-from tests.lib.direct_url import get_created_direct_url_path
 from tests.lib.venv import VirtualEnvironment
 
 distribute_re = re.compile("^distribute==[0-9.]+\n", re.MULTILINE)
@@ -1039,7 +1038,7 @@ def test_freeze_pep610_editable(script: PipTestEnvironment) -> None:
     """
     pkg_path = _create_test_package(script.scratch_path, name="testpkg")
     result = script.pip("install", pkg_path)
-    direct_url_path = get_created_direct_url_path(result, "testpkg")
+    direct_url_path = result.get_created_direct_url_path("testpkg")
     assert direct_url_path
     # patch direct_url.json to simulate an editable install
     with open(direct_url_path) as f:

tests/functional/test_install_direct_url.py

@@ -3,20 +3,19 @@
 from pip._internal.models.direct_url import VcsInfo
 
 from tests.lib import PipTestEnvironment, TestData, _create_test_package
-from tests.lib.direct_url import get_created_direct_url
 
 
 def test_install_find_links_no_direct_url(script: PipTestEnvironment) -> None:
     result = script.pip_install_local("simple")
-    assert not get_created_direct_url(result, "simple")
+    assert not result.get_created_direct_url("simple")
 
 
 def test_install_vcs_non_editable_direct_url(script: PipTestEnvironment) -> None:
     pkg_path = _create_test_package(script.scratch_path, name="testpkg")
     url = pkg_path.as_uri()
     args = ["install", f"git+{url}#egg=testpkg"]
     result = script.pip(*args)
-    direct_url = get_created_direct_url(result, "testpkg")
+    direct_url = result.get_created_direct_url("testpkg")
     assert direct_url
     assert direct_url.url == url
     assert isinstance(direct_url.info, VcsInfo)
@@ -27,7 +26,7 @@ def test_install_archive_direct_url(script: PipTestEnvironment, data: TestData)
     req = "simple @ " + data.packages.joinpath("simple-2.0.tar.gz").as_uri()
     assert req.startswith("simple @ file://")
     result = script.pip("install", req)
-    assert get_created_direct_url(result, "simple")
+    assert result.get_created_direct_url("simple")
 
 
 @pytest.mark.network
@@ -39,7 +38,7 @@ def test_install_vcs_constraint_direct_url(script: PipTestEnvironment) -> None:
         "#egg=pip-test-package"
     )
     result = script.pip("install", "pip-test-package", "-c", constraints_file)
-    assert get_created_direct_url(result, "pip_test_package")
+    assert result.get_created_direct_url("pip_test_package")
 
 
 def test_install_vcs_constraint_direct_file_url(script: PipTestEnvironment) -> None:
@@ -48,4 +47,4 @@ def test_install_vcs_constraint_direct_file_url(script: PipTestEnvironment) -> N
     constraints_file = script.scratch_path / "constraints.txt"
     constraints_file.write_text(f"git+{url}#egg=testpkg")
     result = script.pip("install", "testpkg", "-c", constraints_file)
-    assert get_created_direct_url(result, "testpkg")
+    assert result.get_created_direct_url("testpkg")

tests/functional/test_list.py

@@ -15,7 +15,6 @@
     make_wheel,
     wheel,
 )
-from tests.lib.direct_url import get_created_direct_url_path
 
 
 @pytest.fixture(scope="session")
@@ -736,7 +735,7 @@ def test_list_pep610_editable(script: PipTestEnvironment) -> None:
     """
     pkg_path = _create_test_package(script.scratch_path, name="testpkg")
     result = script.pip("install", pkg_path)
-    direct_url_path = get_created_direct_url_path(result, "testpkg")
+    direct_url_path = result.get_created_direct_url_path("testpkg")
     assert direct_url_path
     # patch direct_url.json to simulate an editable install
     with open(direct_url_path) as f:

tests/functional/test_new_resolver.py

@@ -14,7 +14,6 @@
     create_basic_wheel_for_package,
     create_test_package_with_setup,
 )
-from tests.lib.direct_url import get_created_direct_url
 from tests.lib.venv import VirtualEnvironment
 from tests.lib.wheel import make_wheel
 
@@ -2155,9 +2154,9 @@ def test_new_resolver_direct_url_with_extras(
     )
 
     script.assert_installed(pkg1="1", pkg2="1", pkg3="1")
-    assert not get_created_direct_url(result, "pkg1")
-    assert get_created_direct_url(result, "pkg2")
-    assert not get_created_direct_url(result, "pkg3")
+    assert not result.get_created_direct_url("pkg1")
+    assert result.get_created_direct_url("pkg2")
+    assert not result.get_created_direct_url("pkg3")
 
 
 def test_new_resolver_modifies_installed_incompatible(

tests/lib/__init__.py

@@ -14,6 +14,7 @@
 from contextlib import contextmanager
 from hashlib import sha256
 from io import BytesIO, StringIO
+from pathlib import Path
 from textwrap import dedent
 from typing import Any, AnyStr, Callable, Literal, Protocol, Union, cast
 from urllib.request import pathname2url
@@ -28,6 +29,7 @@
 from pip._internal.index.collector import LinkCollector
 from pip._internal.index.package_finder import PackageFinder
 from pip._internal.locations import get_major_minor_version
+from pip._internal.models.direct_url import DIRECT_URL_METADATA_NAME, DirectUrl
 from pip._internal.models.search_scope import SearchScope
 from pip._internal.models.selection_prefs import SelectionPreferences
 from pip._internal.models.target_python import TargetPython
@@ -298,6 +300,24 @@ def _get_egg_link_path_created(self, egg_link_paths: list[str]) -> str | None:
                 return egg_link_path
         return None
 
+    def get_created_direct_url_path(self, pkg: str) -> Path | None:
+        dist_info_prefix = canonicalize_name(pkg).replace("-", "_") + "-"
+        for filename in self.files_created:
+            if (
+                filename.name == DIRECT_URL_METADATA_NAME
+                and filename.parent.name.endswith(".dist-info")
+                and filename.parent.name.startswith(dist_info_prefix)
+            ):
+                return self.test_env.base_path / filename
+        return None
+
+    def get_created_direct_url(self, pkg: str) -> DirectUrl | None:
+        direct_url_path = self.get_created_direct_url_path(pkg)
+        if direct_url_path:
+            with open(direct_url_path) as f:
+                return DirectUrl.from_json(f.read())
+        return None
+
     def assert_installed(
         self,
         pkg_name: str,
@@ -313,7 +333,7 @@ def assert_installed(
         e = self.test_env
 
         if editable:
-            pkg_dir = e.venv / "src" / canonicalize_name(pkg_name)
+            pkg_dir = e.venv / "src" / canonicalize_name(dist_name)
             # If package was installed in a sub directory
             if sub_dir:
                 pkg_dir = pkg_dir / sub_dir