From cd1ae53490dfeae05032324820acf3c049dde48c Mon Sep 17 00:00:00 2001
From: Gyeongjae Choi <def6488@gmail.com>
Date: Thu, 19 Sep 2024 13:26:46 +0000
Subject: [PATCH] update test

---
 micropip/wheelinfo.py                         |   2 +-
 tests/conftest.py                             |  21 ++--
 .../pytest-7.2.2-py3-none-any.whl.metadata.gz | Bin 0 -> 2838 bytes
 tests/test_wheelinfo.py                       | 100 +++++++++++++++++-
 4 files changed, 114 insertions(+), 9 deletions(-)
 create mode 100644 tests/test_data/wheel/pytest-7.2.2-py3-none-any.whl.metadata.gz

diff --git a/micropip/wheelinfo.py b/micropip/wheelinfo.py
index dbe5d78..c0ed8a7 100644
--- a/micropip/wheelinfo.py
+++ b/micropip/wheelinfo.py
@@ -87,7 +87,7 @@ def from_package_index(
         version: Version,
         sha256: str | None,
         size: int | None,
-        data_dist_info_metadata: DistributionMetadata,
+        data_dist_info_metadata: DistributionMetadata = None,
     ) -> "WheelInfo":
         """Extract available metadata from response received from package index"""
         parsed_url = urlparse(url)
diff --git a/tests/conftest.py b/tests/conftest.py
index c53d723..152310e 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -97,6 +97,7 @@ class Wheel:
         _path: Path
 
         name: str
+        version: str
         filename: str
         top_level: str
         url: str
@@ -118,24 +119,30 @@ def __enter__(self):
     def __exit__(self, *args: Any):
         self._httpserver.__exit__(*args)
 
-    def _register_handler(self, path: Path) -> str:
-        self._httpserver.expect_request(f"/{path.name}").respond_with_data(
-            path.read_bytes(),
+    def _register_handler(self, endpoint: str, data: bytes) -> str:
+        self._httpserver.expect_request(f"/{endpoint}").respond_with_data(
+            data,
             content_type="application/zip",
             headers={"Access-Control-Allow-Origin": "*"},
         )
 
-        return self._httpserver.url_for(f"/{path.name}")
+        return self._httpserver.url_for(f"/{endpoint}")
 
     def add_wheel(self, path: Path, replace: bool = True):
-        name = parse_wheel_filename(path.name)[0]
-        url = self._register_handler(path)
+        name, version = parse_wheel_filename(path.name)[:2]
+        url = self._register_handler(path.name, path.read_bytes())
+
+        metadata_file_endpoint = path.with_suffix(".whl.metadata")
+        metadata_file_gzipped = path.with_suffix(".whl.metadata.gz")
+        if metadata_file_gzipped.exists():
+            data = _read_gzipped_testfile(metadata_file_gzipped)
+            self._register_handler(metadata_file_endpoint.name, data)
 
         if name in self._wheels and not replace:
             return
 
         self._wheels[name] = self.Wheel(
-            path, name, path.name, name.replace("-", "_"), url
+            path, name, version, path.name, name.replace("-", "_"), url
         )
 
     def get(self, name: str) -> Wheel:
diff --git a/tests/test_data/wheel/pytest-7.2.2-py3-none-any.whl.metadata.gz b/tests/test_data/wheel/pytest-7.2.2-py3-none-any.whl.metadata.gz
new file mode 100644
index 0000000000000000000000000000000000000000..2948d2e8636e6e5936f9fb2fa01ca8bb36612e78
GIT binary patch
literal 2838
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

literal 0
HcmV?d00001

diff --git a/tests/test_wheelinfo.py b/tests/test_wheelinfo.py
index ddbb91b..a8809bf 100644
--- a/tests/test_wheelinfo.py
+++ b/tests/test_wheelinfo.py
@@ -1,4 +1,5 @@
 import pytest
+from packaging.utils import parse_wheel_filename
 
 from micropip.wheelinfo import WheelInfo
 
@@ -22,8 +23,9 @@ def test_from_package_index():
     version = "0.0.1"
     sha256 = "dummy-sha256"
     size = 1234
+    data_dist_info_metadata = True
 
-    wheel = WheelInfo.from_package_index(name, filename, url, version, sha256, size)
+    wheel = WheelInfo.from_package_index(name, filename, url, version, sha256, size, data_dist_info_metadata)
 
     assert wheel.name == name
     assert str(wheel.version) == version
@@ -31,6 +33,7 @@ def test_from_package_index():
     assert wheel.filename == filename
     assert wheel.size == size
     assert wheel.sha256 == sha256
+    assert wheel.data_dist_info_metadata == data_dist_info_metadata
 
 
 def test_extract(wheel_catalog, tmp_path):
@@ -89,3 +92,98 @@ async def test_requires(wheel_catalog, tmp_path):
     requirements_extra_testing = [str(r.name) for r in wheel.requires({"testing"})]
     assert "pluggy" in requirements_extra_testing
     assert "hypothesis" in requirements_extra_testing
+
+
+@pytest.mark.asyncio
+async def test_download_pep658_metadata(wheel_catalog):
+    pytest_wheel = wheel_catalog.get("pytest")
+    sha256 = "dummy-sha256"
+    size = 1234
+
+    # 1) metadata available
+    wheel_with_metadata = WheelInfo.from_package_index(
+        pytest_wheel.name,
+        pytest_wheel.filename,
+        pytest_wheel.url,
+        pytest_wheel.version,
+        sha256,
+        size,
+        data_dist_info_metadata=True,
+    )
+
+    assert wheel_with_metadata._metadata is None
+    await wheel_with_metadata.download_pep658_metadata({})
+    assert wheel_with_metadata._metadata is not None
+
+    # metadata should be calculated from the metadata file
+    deps = wheel_with_metadata._metadata.deps
+    assert None in deps
+    assert "testing" in deps
+
+    # 2) metadata not available
+    wheel_without_metadata = WheelInfo.from_package_index(
+        pytest_wheel.name,
+        pytest_wheel.filename,
+        pytest_wheel.url,
+        pytest_wheel.version,
+        sha256,
+        size,
+        data_dist_info_metadata=None,
+    )
+
+    assert wheel_without_metadata._metadata is None
+    await wheel_without_metadata.download_pep658_metadata({})
+    assert wheel_without_metadata._metadata is None
+
+    # 3) the metadata extracted from the wheel should be the same
+    wheel = WheelInfo.from_package_index(
+        pytest_wheel.name,
+        pytest_wheel.filename,
+        pytest_wheel.url,
+        pytest_wheel.version,
+        sha256,
+        size,
+        data_dist_info_metadata=None,
+    )
+
+    assert wheel._metadata is None
+    await wheel.download({})
+    assert wheel._metadata is not None
+
+    assert wheel._metadata.deps == wheel_with_metadata._metadata.deps
+
+
+@pytest.mark.asyncio
+async def test_download_pep658_metadata_checksum(wheel_catalog):
+    pytest_wheel = wheel_catalog.get("pytest")
+    sha256 = "dummy-sha256"
+    size = 1234
+
+    wheel = WheelInfo.from_package_index(
+        pytest_wheel.name,
+        pytest_wheel.filename,
+        pytest_wheel.url,
+        pytest_wheel.version,
+        sha256,
+        size,
+        data_dist_info_metadata={"sha256": "dummy-sha256"},
+    )
+
+    assert wheel._metadata is None
+    with pytest.raises(RuntimeError, match="Invalid checksum: expected dummy-sha256"):
+        await wheel.download_pep658_metadata({})
+
+    checksum = "62eb95408ccec185e7a3b8f354a1df1721cd8f463922f5a900c7bf4b69c5a4e8"  # TODO: calculate this from the file
+    wheel = WheelInfo.from_package_index(
+        pytest_wheel.name,
+        pytest_wheel.filename,
+        pytest_wheel.url,
+        pytest_wheel.version,
+        sha256,
+        size,
+        data_dist_info_metadata={"sha256": checksum},
+    )
+
+    assert wheel._metadata is None
+    await wheel.download_pep658_metadata({})
+    assert wheel._metadata is not None
\ No newline at end of file