URL: https://github.com/SSSD/sssd/pull/5946
Author: aborah-sudo
 Title: #5946: Tests: Fix yum repoquery --recommends sssd-tools test
Action: synchronized

To pull the PR as Git branch:
git remote add ghsssd https://github.com/SSSD/sssd
git fetch ghsssd pull/5946/head:pr5946
git checkout pr5946
From 0fd92229fddf10b21502c715eb205d56b5ebf75f Mon Sep 17 00:00:00 2001
From: Anuj Borah <abo...@redhat.com>
Date: Tue, 11 Jan 2022 18:34:27 +0530
Subject: [PATCH] Tests: Fix yum repoquery --recommends sssd-tools test

The reason for this patch is the change of sssd-tools's sssd-dbus dependency
from Recommends to Requires included in
https://github.com/SSSD/sssd/commit/5ee8657c38f4849694bcb3f2ce958012f072ace0
---
 src/tests/multihost/alltests/test_services.py | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/tests/multihost/alltests/test_services.py b/src/tests/multihost/alltests/test_services.py
index b84c0d7812..f1a8e56ef2 100644
--- a/src/tests/multihost/alltests/test_services.py
+++ b/src/tests/multihost/alltests/test_services.py
@@ -88,15 +88,17 @@ def test_0003_bz1713368(self, multihost):
         """
         # sssd-dbus is a weak dependency of sssd-tools package so we did not
         # get sssd-dbus in '# yum deplist sssd-tools' command
-        rpm_grep = 'yum repoquery --recommends sssd-tools'
-        cmd = multihost.client[0].run_command(rpm_grep, raiseonerr=False)
+        version = float(re.findall("\d+\.\d+", multihost.client[0].distro)[0])
+        if version >= 9:
+            rpm_grep = 'yum repoquery --requires sssd-tools'
+            cmd = multihost.client[0].run_command(rpm_grep, raiseonerr=False)
+        else:
+            rpm_grep = 'yum repoquery --recommends sssd-tools'
+            cmd = multihost.client[0].run_command(rpm_grep, raiseonerr=False)
         if cmd.returncode == 0:
-            status = 'PASS'
             find = re.compile(r'sssd-dbus')
             result = find.search(cmd.stdout_text)
-            if result is None:
-                status = 'FAIL'
-            assert status != 'FAIL'
+            assert result is None
 
     @pytest.mark.tier1
     def test_0004_membership_with_files_provider(self, multihost):
_______________________________________________
sssd-devel mailing list -- sssd-devel@lists.fedorahosted.org
To unsubscribe send an email to sssd-devel-le...@lists.fedorahosted.org
Fedora Code of Conduct: 
https://docs.fedoraproject.org/en-US/project/code-of-conduct/
List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines
List Archives: 
https://lists.fedorahosted.org/archives/list/sssd-devel@lists.fedorahosted.org
Do not reply to spam on the list, report it: 
https://pagure.io/fedora-infrastructure

Reply via email to