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