From d1a6b72f3ca995446397a1b91160421b6feb32d1 Mon Sep 17 00:00:00 2001 From: Dominik Perpeet Date: Wed, 2 Aug 2017 23:52:31 +0200 Subject: [PATCH 18/23] test: Modify tests to work with stable cockpit on rhel-7-4 Cherry-picked relevant parts from upstream commits 66de1a7 and 2680244. Additionally skip the check-setroubleshoot testTroubleshootAlerts test on rhel-7 too, as that has the same "too old setroubleshoot" problem. --- test/verify/check-docker-storage | 2 +- test/verify/check-setroubleshoot | 3 +++ test/verify/naughty-rhel-7-4 | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) create mode 120000 test/verify/naughty-rhel-7-4 diff --git a/test/verify/check-docker-storage b/test/verify/check-docker-storage index bc15609..9bd030a 100755 --- a/test/verify/check-docker-storage +++ b/test/verify/check-docker-storage @@ -66,7 +66,7 @@ def initially_loopbacked(machine): # device is added. # def initially_without_vgroup(machine): - return machine.image in [ "fedora-24", "rhel-7" ] + return machine.image in [ "fedora-24", "rhel-7", "rhel-7-4" ] @skipImage("No cockpit-docker on i386", "fedora-i386") class TestDockerStorage(MachineCase): diff --git a/test/verify/check-setroubleshoot b/test/verify/check-setroubleshoot index b32c55e..5df88cf 100755 --- a/test/verify/check-setroubleshoot +++ b/test/verify/check-setroubleshoot @@ -114,6 +114,9 @@ class TestSelinux(MachineCase): self.machine.execute(script=SELINUX_FIXABLE_ALERT_SCRIPT) row_selector = "tbody:contains('sshd from open access on the file')" + + if self.machine.image in ["rhel-7", "rhel-7-4"]: + self.skipTest("Unable to fix automatically, setroubleshoot too old") # wait for the alert to appear b.wait_present(row_selector) diff --git a/test/verify/naughty-rhel-7-4 b/test/verify/naughty-rhel-7-4 new file mode 120000 index 0000000..460b3b3 --- /dev/null +++ b/test/verify/naughty-rhel-7-4 @@ -0,0 +1 @@ +naughty-rhel-7 \ No newline at end of file -- 2.13.5