From 6a604da4ea1be12fe9183da5f78e6fba8ee5c195 Mon Sep 17 00:00:00 2001
From: Nicolas Dandrimont <nicolas@dandrimont.eu>
Date: Wed, 19 Feb 2025 16:46:33 +0100
Subject: [PATCH] Ensure compatibility with rpm2cpio 4.20
It seems that the cpio files generated by rpm2cpio now have filenames
with a leading `./`. Add support for this change in the test fixture (it
seems that the actual extraction isn't affected by this change).
---
swh/loader/package/rpm/tests/test_rpm.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/swh/loader/package/rpm/tests/test_rpm.py b/swh/loader/package/rpm/tests/test_rpm.py
index f7adb507..1d54a1a3 100644
--- a/swh/loader/package/rpm/tests/test_rpm.py
+++ b/swh/loader/package/rpm/tests/test_rpm.py
@@ -142,8 +142,8 @@ def test_download_and_extract_rpm_package(requests_mock_datadir):
assert os.path.exists(f"{tmpdir}/extracted/nginx-1.18.0.tar.gz")
with open(f"{tmpdir}/extract.log", "r") as f:
- logs = f.read()
- assert logs.startswith("404.html")
+ logs = f.readlines()
+ assert logs[0].strip() in ("404.html", "./404.html")
def test_extract_non_rpm_package(requests_mock_datadir):
--
GitLab