From c3d7ee98173547378cd293b4d836e7bc15614982 Mon Sep 17 00:00:00 2001 From: Iker Pedrosa Date: Wed, 8 Jan 2025 16:31:06 +0100 Subject: [PATCH] tests: improve feature presence automation `files-provider` stopped being shipped in Fedora 40 in sssd-2.9. Thus, the detection matrix need to be updated to take this into account. In addition, the assertion messages weren't clear enough, so I've improved them to understand them at a first glance. Signed-off-by: Iker Pedrosa --- src/tests/system/tests/test_feature.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/tests/system/tests/test_feature.py b/src/tests/system/tests/test_feature.py index fd26959cad..9a657a48dc 100644 --- a/src/tests/system/tests/test_feature.py +++ b/src/tests/system/tests/test_feature.py @@ -19,7 +19,7 @@ ("Red Hat Enterprise Linux", 9, 4, 2, 9, "passkey", True), ("Ubuntu", 23, 10, 2, 9, "passkey", True), (None, None, None, 2, 10, "knownhosts", True), - ("Fedora", 40, 0, 2, 10, "files-provider", False), + ("Fedora", 40, 0, 2, 9, "files-provider", False), ("CentOS Stream", 10, 0, 2, 10, "files-provider", False), ("Red Hat Enterprise Linux", 10, 0, 2, 10, "files-provider", False), (None, None, None, 2, 10, "ldap_use_ppolicy", True), @@ -75,12 +75,14 @@ def test_feature__presence( if sssd_version["major"] > sssd_major or ( sssd_version["major"] == sssd_major and sssd_version["minor"] >= sssd_minor ): + state = "" if presence else "not" assert client.features[feature] == presence, ( - f"Feature {feature} should be present in {distribution} {distro_major}.{distro_minor} with " - "sssd-{sssd_major}.{sssd_minor}" + f"Feature {feature} should {state} be present in {distribution} {distro_major}.{distro_minor} with " + f"sssd-{sssd_version["major"]}.{sssd_version["minor"]}" ) else: + state = "not" if presence else "" assert client.features[feature] != presence, ( - f"Feature {feature} should not be present in {distribution} {distro_major}.{distro_minor} with " - "sssd-{sssd_major}.{sssd_minor}" + f"Feature {feature} should {state} be present in {distribution} {distro_major}.{distro_minor} with " + f"sssd-{sssd_version["major"]}.{sssd_version["minor"]}" )