From 630c408f9e236fc4f9ad0fc7195813a3770f8ff3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Cami?= Date: Tue, 30 Jun 2020 11:50:02 +0200 Subject: [PATCH] ipatests: remove dnf workaround from test_epn.py MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 73c02f635 introduced a workaround to make sure the latest version of (free)ipa-client-epn was installed. Since cc624fb17 this should not be needed anymore. Fixes: https://pagure.io/freeipa/issue/8391 Signed-off-by: François Cami Reviewed-By: Rob Crittenden Reviewed-By: Florence Blanc-Renaud --- ipatests/test_integration/test_epn.py | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/ipatests/test_integration/test_epn.py b/ipatests/test_integration/test_epn.py index 9a9fb17b9..9b7149202 100644 --- a/ipatests/test_integration/test_epn.py +++ b/ipatests/test_integration/test_epn.py @@ -216,22 +216,6 @@ class TestEPN(IntegrationTest): """Check that the EPN configuration file is installed. https://pagure.io/freeipa/issue/8374 """ - # workaround for https://github.com/freeipa/freeipa-pr-ci/issues/378 - rpm_q_cmds = [ - ["rpm", "-qi", "freeipa-client"], - ["rpm", "-qi", "freeipa-client-epn"], - ["rpm", "-qc", "freeipa-client-epn"], - ["rpm", "-V", "freeipa-client-epn"], - ["rpm", "-qvc", "freeipa-client-epn"], - ["ls", "-l", "/etc/ipa", "/etc/ipa/epn"], - ] - for cmd in rpm_q_cmds: - self.master.run_command(cmd, raiseonerr=False) - tasks.uninstall_packages(self.master, ["*ipa-client-epn"]) - tasks.install_packages(self.master, ["*ipa-client-epn"]) - for cmd in rpm_q_cmds: - self.master.run_command(cmd, raiseonerr=False) - # end workaround epn_conf = "/etc/ipa/epn.conf" epn_template = "/etc/ipa/epn/expire_msg.template" cmd1 = self.master.run_command(["rpm", "-qc", "freeipa-client-epn"])