Fix tests for twine 7.0.0

Assisted By: Claude Opus 4.6

Author: jobselko

pulp_python/tests/functional/api/test_attestations.py

@@ -1,7 +1,5 @@
 import json
-import shutil
 import subprocess
-from pathlib import Path
 from urllib.parse import urljoin
 
 import pytest
@@ -10,6 +8,8 @@
 
 from pulpcore.tests.functional.utils import PulpTaskError
 
+from pulp_python.tests.functional.constants import PYTHON_FIXTURES_URL
+
 
 @pytest.fixture(scope="session")
 def twine_package():
@@ -206,25 +206,24 @@ def test_attestation_twine_upload(
     pulpcore_bindings,
     python_content_summary,
     python_empty_repo_distro,
-    python_package_dist_directory,
+    http_get,
+    tmp_path,
     monitor_task,
 ):
     """Tests that packages with attestations can be properly uploaded through Twine."""
+    packages_url = urljoin(PYTHON_FIXTURES_URL, "packages/")
+    filenames = ("twine-6.2.0.tar.gz", "twine-6.2.0-py3-none-any.whl")
+    for filename in filenames:
+        with open(tmp_path / filename, "wb") as f:
+            f.write(http_get(urljoin(packages_url, filename)))
+
+        provenance = json.loads(http_get(urljoin(packages_url, f"{filename}.provenance.json")))
+        attestation = provenance["attestation_bundles"][0]["attestations"][0]
+        with open(tmp_path / f"{filename}.publish.attestation", "w") as f:
+            json.dump(attestation, f)
+
     repo, distro = python_empty_repo_distro()
     url = urljoin(distro.base_url, "legacy/")
-    dist_dir, _, _ = python_package_dist_directory
-
-    # Copy attestation files from test assets to dist_dir
-    assets_dir = Path(__file__).parent.parent / "assets"
-    attestation_files = [
-        "shelf-reader-0.1.tar.gz.publish.attestation",
-        "shelf_reader-0.1-py2-none-any.whl.publish.attestation",
-    ]
-    for attestation_file in attestation_files:
-        src = assets_dir / attestation_file
-        dst = dist_dir / attestation_file
-        shutil.copy2(src, dst)
-
     username, password = "admin", "password"
     subprocess.run(
         (
@@ -233,7 +232,7 @@ def test_attestation_twine_upload(
             "--attestations",
             "--repository-url",
             url,
-            dist_dir / "*",
+            tmp_path / "*",
             "-u",
             username,
             "-p",
@@ -245,7 +244,7 @@ def test_attestation_twine_upload(
     tasks = pulpcore_bindings.TasksApi.list(reserved_resources=repo.pulp_href).results
     for task in reversed(tasks):
         t = monitor_task(task.pulp_href)
-        repo_ver_href = t.created_resources[0]
+        repo_ver_href = [r for r in t.created_resources if "versions" in r][0]
 
     assert repo_ver_href.endswith("versions/2/")
     summary = python_content_summary(repository_version=repo_ver_href)

pulp_python/tests/functional/api/test_pypi_apis.py

@@ -11,6 +11,7 @@
     PYPI_SIMPLE_V1_JSON,
     PYTHON_EGG_FILENAME,
     PYTHON_EGG_SHA256,
+    PYTHON_FIXTURES_URL,
     PYTHON_MD_PROJECT_SPECIFIER,
     PYTHON_MD_PYPI_SUMMARY,
     PYTHON_WHEEL_FILENAME,
@@ -179,21 +180,26 @@ def test_twine_upload(
     pulpcore_bindings,
     python_content_summary,
     python_empty_repo_distro,
-    python_package_dist_directory,
+    http_get,
+    tmp_path,
     monitor_task,
 ):
     """Tests that packages can be properly uploaded through Twine."""
+    packages_url = urljoin(PYTHON_FIXTURES_URL, "packages/")
+    for filename in ("pytz-2023.3.tar.gz", "pytz-2023.3-py2.py3-none-any.whl"):
+        with open(tmp_path / filename, "wb") as f:
+            f.write(http_get(urljoin(packages_url, filename)))
+
     repo, distro = python_empty_repo_distro()
     url = urljoin(distro.base_url, "legacy/")
-    dist_dir, _, _ = python_package_dist_directory
     username, password = "admin", "password"
     subprocess.run(
         (
             "twine",
             "upload",
             "--repository-url",
             url,
-            dist_dir / "*",
+            tmp_path / "*",
             "-u",
             username,
             "-p",
@@ -205,7 +211,7 @@ def test_twine_upload(
     tasks = pulpcore_bindings.TasksApi.list(reserved_resources=repo.pulp_href).results
     for task in reversed(tasks):
         t = monitor_task(task.pulp_href)
-        repo_ver_href = t.created_resources[-1]
+        repo_ver_href = [r for r in t.created_resources if "versions" in r][0]
     summary = python_content_summary(repository_version=repo_ver_href)
     assert summary.present["python.python"]["count"] == 2
 
@@ -217,7 +223,7 @@ def test_twine_upload(
                 "upload",
                 "--repository-url",
                 url,
-                dist_dir / "*",
+                tmp_path / "*",
                 "-u",
                 username,
                 "-p",