|
 |
2587cc |
From f3602d50c02c21c4ce361c05b03b6d86e9323711 Mon Sep 17 00:00:00 2001
|
|
|
2587cc |
From: Dominik Perpeet <dperpeet@redhat.com>
|
|
|
2587cc |
Date: Tue, 20 Jun 2017 14:08:16 +0200
|
|
|
2587cc |
Subject: [PATCH 10/16] test: Add rhel-7-4 to test exceptions
|
|
|
2587cc |
|
|
|
2587cc |
These tests need to behave differently on rhel-7-4, not just rhel-7.
|
|
|
2587cc |
|
|
|
2587cc |
Part of original commit:
|
|
|
2587cc |
8931be44b7962425ef0f0d8c1637268c7178f2da
|
|
|
2587cc |
test: Build rhel image from latest compose
|
|
|
2587cc |
|
|
|
2587cc |
Closes #7025
|
|
|
2587cc |
Reviewed-by: Stef Walter <stefw@redhat.com>
|
|
|
2587cc |
---
|
|
|
2587cc |
test/verify/check-docker-storage | 1 +
|
|
|
2587cc |
test/verify/check-ostree | 4 ++--
|
|
|
2587cc |
test/verify/check-storage-format | 2 +-
|
|
|
2587cc |
test/verify/check-storage-iscsi | 2 +-
|
|
|
2587cc |
test/verify/check-system-info | 4 ++--
|
|
|
2587cc |
5 files changed, 7 insertions(+), 6 deletions(-)
|
|
|
2587cc |
|
|
|
2587cc |
diff --git a/test/verify/check-docker-storage b/test/verify/check-docker-storage
|
|
|
2587cc |
index 81989e2..37f2da7 100755
|
|
|
2587cc |
--- a/test/verify/check-docker-storage
|
|
|
2587cc |
+++ b/test/verify/check-docker-storage
|
|
|
2587cc |
@@ -38,6 +38,7 @@ def can_manage(machine):
|
|
|
2587cc |
"fedora-testing",
|
|
|
2587cc |
"fedora-24",
|
|
|
2587cc |
"rhel-7",
|
|
|
2587cc |
+ "rhel-7-4",
|
|
|
2587cc |
"centos-7",
|
|
|
2587cc |
"rhel-atomic",
|
|
|
2587cc |
"fedora-atomic",
|
|
|
2587cc |
diff --git a/test/verify/check-ostree b/test/verify/check-ostree
|
|
|
2587cc |
index e1d3cda..5c50efa 100755
|
|
|
2587cc |
--- a/test/verify/check-ostree
|
|
|
2587cc |
+++ b/test/verify/check-ostree
|
|
|
2587cc |
@@ -113,7 +113,7 @@ def rhsmcertd_hack(m):
|
|
|
2587cc |
m.execute("systemctl stop rhsmcertd || true")
|
|
|
2587cc |
|
|
|
2587cc |
|
|
|
2587cc |
-@skipImage("No OSTree available", "centos-7", "debian-8", "debian-testing", "fedora-24", "fedora-25", "fedora-testing", "fedora-i386", "rhel-7", "ubuntu-1604")
|
|
|
2587cc |
+@skipImage("No OSTree available", "centos-7", "debian-8", "debian-testing", "fedora-24", "fedora-25", "fedora-testing", "fedora-i386", "rhel-7", "rhel-7-4", "ubuntu-1604")
|
|
|
2587cc |
class OstreeRestartCase(MachineCase):
|
|
|
2587cc |
|
|
|
2587cc |
def setUp(self):
|
|
|
2587cc |
@@ -418,7 +418,7 @@ class OstreeRestartCase(MachineCase):
|
|
|
2587cc |
|
|
|
2587cc |
self.allow_restart_journal_messages()
|
|
|
2587cc |
|
|
|
2587cc |
-@skipImage("No OSTree available", "centos-7", "debian-8", "debian-testing", "fedora-24", "fedora-25", "fedora-testing", "fedora-i386", "rhel-7", "ubuntu-1604")
|
|
|
2587cc |
+@skipImage("No OSTree available", "centos-7", "debian-8", "debian-testing", "fedora-24", "fedora-25", "fedora-testing", "fedora-i386", "rhel-7", "rhel-7-4", "ubuntu-1604")
|
|
|
2587cc |
class OstreeCase(MachineCase):
|
|
|
2587cc |
|
|
|
2587cc |
def testRemoteManagement(self):
|
|
|
2587cc |
diff --git a/test/verify/check-storage-format b/test/verify/check-storage-format
|
|
|
2587cc |
index 04f8889..0606041 100755
|
|
|
2587cc |
--- a/test/verify/check-storage-format
|
|
|
2587cc |
+++ b/test/verify/check-storage-format
|
|
|
2587cc |
@@ -73,7 +73,7 @@ class TestStorage(StorageCase):
|
|
|
2587cc |
check_type("xfs")
|
|
|
2587cc |
check_type("ext4")
|
|
|
2587cc |
check_type("vfat")
|
|
|
2587cc |
- if not m.image in [ "rhel-7", "centos-7" ]:
|
|
|
2587cc |
+ if not m.image in [ "rhel-7", "rhel-7-4", "centos-7" ]:
|
|
|
2587cc |
check_type("ntfs")
|
|
|
2587cc |
|
|
|
2587cc |
if __name__ == '__main__':
|
|
|
2587cc |
diff --git a/test/verify/check-storage-iscsi b/test/verify/check-storage-iscsi
|
|
|
2587cc |
index 88e9cc4..ddd7b26 100755
|
|
|
2587cc |
--- a/test/verify/check-storage-iscsi
|
|
|
2587cc |
+++ b/test/verify/check-storage-iscsi
|
|
|
2587cc |
@@ -31,7 +31,7 @@ class TestStorage(StorageCase):
|
|
|
2587cc |
b.wait_timeout(120)
|
|
|
2587cc |
|
|
|
2587cc |
# rhel-7 is missing the iSCSI session API
|
|
|
2587cc |
- if m.image == "rhel-7":
|
|
|
2587cc |
+ if m.image in ["rhel-7", "rhel-7-4"]:
|
|
|
2587cc |
self.login_and_go("/storage")
|
|
|
2587cc |
# The optional parts of the UI have been configured
|
|
|
2587cc |
# properly before the page is shown, so we can now
|
|
|
2587cc |
diff --git a/test/verify/check-system-info b/test/verify/check-system-info
|
|
|
2587cc |
index edbd336..60cd27b 100755
|
|
|
2587cc |
--- a/test/verify/check-system-info
|
|
|
2587cc |
+++ b/test/verify/check-system-info
|
|
|
2587cc |
@@ -180,7 +180,7 @@ class TestSystemInfo(MachineCase):
|
|
|
2587cc |
b = self.browser
|
|
|
2587cc |
|
|
|
2587cc |
network_time_prefix = "Network time on"
|
|
|
2587cc |
- if m.image in {"debian-8", "rhel-7", "centos-7", "rhel-atomic", "continuous-atomic"}:
|
|
|
2587cc |
+ if m.image in {"debian-8", "rhel-7", "rhel-7-4", "centos-7", "rhel-atomic", "continuous-atomic"}:
|
|
|
2587cc |
network_time_prefix = "NTP enabled"
|
|
|
2587cc |
|
|
|
2587cc |
# make sure system is on expected timezone EEST
|
|
|
2587cc |
@@ -241,7 +241,7 @@ class TestSystemInfo(MachineCase):
|
|
|
2587cc |
self.assertIn("Mon Jun 4 06:34:", m.execute("date"))
|
|
|
2587cc |
self.assertIn("EEST 2018\n", m.execute("date"))
|
|
|
2587cc |
|
|
|
2587cc |
- @skipImage("No NTP servers config", "centos-7", "continuous-atomic", "rhel-7", "rhel-atomic")
|
|
|
2587cc |
+ @skipImage("No NTP servers config", "centos-7", "continuous-atomic", "rhel-7", "rhel-7-4", "rhel-atomic")
|
|
|
2587cc |
def testTimeServers(self):
|
|
|
2587cc |
m = self.machine
|
|
|
2587cc |
b = self.browser
|
|
|
2587cc |
--
|
|
|
2587cc |
2.9.4
|
|
|
2587cc |
|