From 09c7c37d2ac2e6ff6c8259bd2d99dceec6a46d4c Mon Sep 17 00:00:00 2001
From: Martin Pitt <mpitt@redhat.com>
Date: Thu, 5 Sep 2019 11:11:18 +0200
Subject: [PATCH] test: Fix rhsmd cleanup in check-packagekit

When disabling /usr/libexec/rhsmd (on RHEL images), re-enable it at the
end of the test. This unbreaks running more than one check-packagekit
test on an external testbed.
---
 test/verify/check-packagekit | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/verify/check-packagekit b/test/verify/check-packagekit
index 47641875f..415aa9565 100755
--- a/test/verify/check-packagekit
+++ b/test/verify/check-packagekit
@@ -48,6 +48,7 @@
         # On other OSes (Fedora/CentOS) we expect sub-man to be disabled in yum, so it should not get in the way there
         if self.machine.image.startswith("rhel"):
             self.machine.execute("mv /usr/libexec/rhsmd /usr/libexec/rhsmd.disabled")
+            self.addCleanup(self.machine.execute, "mv /usr/libexec/rhsmd.disabled /usr/libexec/rhsmd")
 
         # only the yum backend properly recognizes "enhancement" severity; apt
         # does not have that metadata and PackageKit-dnf does not parse it
-- 
2.21.0