From 4f72afa3c2c4a9e4e4bb170ce057db18386a3799 Mon Sep 17 00:00:00 2001 From: Pedro Brochado Date: Wed, 2 Oct 2024 09:21:42 -0300 Subject: [PATCH] Ignore 'prn' field on metadata comparing tests The prn field is not RPM metadata, it is pulp specific metadata, so this can be safely ignored. Prn was introduced in https://github.com/pulp/pulpcore/pull/5813 --- pulp_rpm/tests/functional/api/test_sync.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pulp_rpm/tests/functional/api/test_sync.py b/pulp_rpm/tests/functional/api/test_sync.py index 3779302ba..4c8fd3b64 100644 --- a/pulp_rpm/tests/functional/api/test_sync.py +++ b/pulp_rpm/tests/functional/api/test_sync.py @@ -944,7 +944,7 @@ def test_core_metadata(init_and_sync, rpm_package_api): diff = dictdiffer.diff( package, RPM_COMPLEX_PACKAGE_DATA, - ignore={"time_file", "pulp_created", "pulp_last_updated", "pulp_href"}, + ignore={"time_file", "pulp_created", "pulp_last_updated", "pulp_href", "prn"}, ) assert list(diff) == [], list(diff) @@ -1039,16 +1039,20 @@ def module_obsolete_key(m): for m1, m2 in zip(modules, RPM_MODULEMDS_DATA): diff = dictdiffer.diff( - m1, m2, ignore={"packages", "pulp_created", "pulp_last_updated", "pulp_href"} + m1, m2, ignore={"packages", "pulp_created", "pulp_last_updated", "pulp_href", "prn"} ) assert list(diff) == [], list(diff) for m1, m2 in zip(module_defaults, RPM_MODULEMD_DEFAULTS_DATA): - diff = dictdiffer.diff(m1, m2, ignore={"pulp_created", "pulp_last_updated", "pulp_href"}) + diff = dictdiffer.diff( + m1, m2, ignore={"pulp_created", "pulp_last_updated", "pulp_href", "prn"} + ) assert list(diff) == [], list(diff) for m1, m2 in zip(module_obsoletes, RPM_MODULEMD_OBSOLETES_DATA): - diff = dictdiffer.diff(m1, m2, ignore={"pulp_created", "pulp_last_updated", "pulp_href"}) + diff = dictdiffer.diff( + m1, m2, ignore={"pulp_created", "pulp_last_updated", "pulp_href", "prn"} + ) assert list(diff) == [], list(diff) # assert all package from modular repo is marked as modular