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