Skip to content

Commit

Permalink
test: drop rhcm workaround
Browse files Browse the repository at this point in the history
The Github issue can no longer be found and the tests seem to succeed
without stopping rhsmcertd.
  • Loading branch information
jelly committed Nov 24, 2023
1 parent 7b7f1d4 commit e99f085
Showing 1 changed file with 0 additions and 14 deletions.
14 changes: 0 additions & 14 deletions test/check-ostree
Original file line number Diff line number Diff line change
Expand Up @@ -155,12 +155,6 @@ def generate_new_commit(m, pkg_to_remove):
m.execute(["ostree", "summary", f"--repo={REPO_LOCATION}", "-u"])


def rhsmcertd_hack(m):
# HACK: https://github.com/candlepin/subscription-manager/issues/1404
m.execute("systemctl disable rhsmcertd || true")
m.execute("systemctl stop rhsmcertd || true")


def get_name(self):
if self.image == "rhel4edge":
return "rhel-edge"
Expand All @@ -178,8 +172,6 @@ class OstreeRestartCase(testlib.MachineCase):

remove_pkg = m.execute("rpm -qa | grep socat").strip()

rhsmcertd_hack(m)

chrony = m.execute("rpm -qa | grep chrony").strip()
tzdata = m.execute("rpm -qa | grep tzdata").strip()

Expand Down Expand Up @@ -359,7 +351,6 @@ class OstreeRestartCase(testlib.MachineCase):
"--add-metadata-string", "version=branch-version"], timeout=600)
m.execute(["ostree", "summary", f"--repo={REPO_LOCATION}", "-u"])

rhsmcertd_hack(m)
m.start_cockpit()
b.login_and_go("/updates")
b.enter_page("/updates")
Expand Down Expand Up @@ -480,7 +471,6 @@ class OstreeCase(testlib.MachineCase):
start_trivial_httpd(m)
branch = m.execute(f"ostree refs --repo={REPO_LOCATION}").strip()

rhsmcertd_hack(m)
m.start_cockpit()
b.login_and_go("/updates")
b.enter_page("/updates")
Expand Down Expand Up @@ -688,8 +678,6 @@ class OstreeCase(testlib.MachineCase):
m = self.machine
b = self.browser

rhsmcertd_hack(m)

self.login_and_go("/updates", superuser=False)
b.wait_in_text(".pf-v5-c-empty-state__body", "Not authorized")
self.assertIn("Reconnect", b.text(".pf-v5-c-empty-state button"))
Expand Down Expand Up @@ -719,8 +707,6 @@ class OstreeCase(testlib.MachineCase):
m = self.machine
b = self.browser

rhsmcertd_hack(m)

# preloading works, no updates available
m.start_cockpit()
b.login_and_go("/system")
Expand Down

0 comments on commit e99f085

Please sign in to comment.