From 05fc2d8f0670c3d53375b52065ace5f39c0322e5 Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Tue, 5 Dec 2023 15:13:04 +0100 Subject: [PATCH] test: Drop remaining vestiges of yum That was a RHEL 7 thing, and dead code. --- test/common/packagelib.py | 4 ++-- test/verify/check-packagekit | 23 +++-------------------- test/verify/check-system-realms | 2 +- 3 files changed, 6 insertions(+), 23 deletions(-) diff --git a/test/common/packagelib.py b/test/common/packagelib.py index 8b31c367e28d..696706084f67 100644 --- a/test/common/packagelib.py +++ b/test/common/packagelib.py @@ -100,7 +100,7 @@ def setUp(self): else: self.restore_dir("/etc/yum.repos.d", reboot_safe=True) self.restore_dir("/var/cache/dnf", reboot_safe=True) - self.machine.execute("rm -rf /etc/yum.repos.d/* /var/cache/yum/* /var/cache/dnf/*") + self.machine.execute("rm -rf /etc/yum.repos.d/* /var/cache/dnf/*") # have PackageKit start from a clean slate self.machine.execute("systemctl stop packagekit") @@ -425,4 +425,4 @@ def enableRepo(self): echo '{1}' > /tmp/updateinfo.xml createrepo_c {0} modifyrepo_c /tmp/updateinfo.xml {0}/repodata - $(which dnf 2>/dev/null|| which yum) clean all""".format(self.repo_dir, self.createYumUpdateInfo())) + dnf clean all""".format(self.repo_dir, self.createYumUpdateInfo())) diff --git a/test/verify/check-packagekit b/test/verify/check-packagekit index 4247e73b17ed..c519086825fb 100755 --- a/test/verify/check-packagekit +++ b/test/verify/check-packagekit @@ -34,7 +34,7 @@ class NoSubManCase(packagelib.PackageCase): super().setUp() # Disable Subscription Manager on RHEL for these tests; subscriptions are tested in a separate class - # On other OSes (Fedora/CentOS) we expect sub-man to be disabled in yum, so it should not get in the way there + # On other OSes (Fedora/CentOS) we expect sub-man to be disabled in dnf, so it should not get in the way there if self.machine.image.startswith("rhel") or self.machine.image.startswith("centos"): self.machine.execute("systemctl stop rhsm.service; systemctl mask rhsm.service") self.addCleanup(self.machine.execute, "systemctl unmask rhsm.service") @@ -52,7 +52,7 @@ class TestUpdates(NoSubManCase): pkcon_version = self.machine.execute("pkcon --version").strip() - # only the yum and PackageKit ≥ 1.2.4 dnf (https://github.com/PackageKit/PackageKit/issues/268) backends + # only the PackageKit ≥ 1.2.4 dnf (https://github.com/PackageKit/PackageKit/issues/268) backends # properly recognize "enhancement" severity; apt does not have that metadata self.supports_severity = not (self.backend == "apt" or pkcon_version < "1.2.4") @@ -720,23 +720,6 @@ ExecStart=/usr/local/bin/{packageName} sel = self.check_nth_update(3, "sevcritical", "5-2", "security", 1, desc_matches=["More broken stuff"]) - if self.backend == 'yum': - # sevcritical has a severity and errata - details = b.text(sel + " .pf-m-expanded") - self.assertIn("Severity", details) - self.assertIn("critical", details) - self.assertIn("Errata", details) - self.assertIn("RHSA-2000:0001", details) - self.assertIn("RHSA-2000:0002", details) - # icon has critical class - self.assertIn("severity-critical", b.attr(sel + " .severity-icon", "class")) - b.mouse(sel + " .severity-icon", "mouseenter") - b.wait_text(".pf-v5-c-tooltip", "critical") - b.mouse(sel + " .severity-icon", "mouseleave") - b.wait_not_present(".pf-v5-c-tooltip") - # details has link to severity definition - self.assertIn("access.redhat.com", b.attr(sel + " .pf-m-expanded dd.severity a:first-of-type", "href")) - # buggy: bug refs, no security sel = self.check_nth_update(4, "buggy", "2-2", "bug", 2, bugs=["123", "456"], desc_matches=["Fixit"]) # should filter out enumeration in overview @@ -1412,7 +1395,7 @@ class TestAutoUpdates(NoSubManCase): def setUp(self): super().setUp() - # not implemented for yum and apt yet, only dnf + # not implemented for apt yet, only dnf self.supported_backend = self.backend in ["dnf"] if self.backend == 'dnf': self.restore_file("/etc/dnf/automatic.conf") diff --git a/test/verify/check-system-realms b/test/verify/check-system-realms index 300800f5b802..802258612426 100755 --- a/test/verify/check-system-realms +++ b/test/verify/check-system-realms @@ -1144,7 +1144,7 @@ class TestPackageInstall(packagelib.PackageCase): m = self.machine b = self.browser - m.execute("dpkg --purge realmd 2>/dev/null || rpm --erase realmd || yum remove -y realmd") + m.execute("dpkg --purge realmd 2>/dev/null || rpm --erase realmd || dnf remove -y realmd") # case 1: disable PackageKit m.execute("systemctl mask packagekit; systemctl stop packagekit.service || true")