From cd5bce10444b8c1bea0210c94ab25c3b38d4bb0b Mon Sep 17 00:00:00 2001

From: Martin Pitt <martin@piware.de>

Date: Sun, 10 Dec 2017 12:13:58 +0100

Subject: [PATCH 2/6] test: Adjust for RHEL 7.5 image

Backported from master commit 42ef1b8c (without the bots/ parts) and

commits 71b4dd0b4 and 657d49bc65.

---

 test/verify/check-docker-storage      | 1 +

 test/verify/check-journal             | 6 +++---

 test/verify/check-networking-settings | 6 +++---

 test/verify/check-ostree              | 4 ++--

 test/verify/check-packagekit          | 4 ++--

 test/verify/check-storage-format      | 2 +-

 test/verify/check-storage-iscsi       | 2 +-

 test/verify/check-system-info         | 2 +-

 8 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/test/verify/check-docker-storage b/test/verify/check-docker-storage

index 103ef02..73f6180 100755

--- a/test/verify/check-docker-storage

+++ b/test/verify/check-docker-storage

@@ -41,6 +41,7 @@ def can_manage(machine):

                               "fedora-testing",

                               "rhel-7",

                               "rhel-7-4",

+                              "rhel-7-5",

                               "centos-7",

                               "rhel-atomic",

                               "fedora-atomic",

diff --git a/test/verify/check-journal b/test/verify/check-journal

index c7921bd..fe7c59b 100755

--- a/test/verify/check-journal

+++ b/test/verify/check-journal

@@ -295,7 +295,7 @@ s.send("PRIORITY=3\\nFOO=bar\\n")'

         b.wait_text("#journal-entry-message", "[no data]")

-    @skipImage("Newer version of ABRT required", "centos-7", "rhel-7", "fedora-25", "fedora-i386", "fedora-testing", "rhel-7-4")

+    @skipImage("Newer version of ABRT required", "centos-7", "rhel-7", "fedora-25", "fedora-i386", "fedora-testing", "rhel-7-4", "rhel-7-5")

     @skipImage("ABRT not available", "debian-stable", "debian-testing", "ubuntu-stable", "ubuntu-1604", "rhel-atomic", "fedora-atomic", "continuous-atomic")

     def testAbrtSegv(self):

         b = self.browser

@@ -330,7 +330,7 @@ s.send("PRIORITY=3\\nFOO=bar\\n")'

         sel += " .panel-body:contains('signal: 11  executable: ')"

         b.wait_present(sel)

-    @skipImage("Newer version of ABRT required", "centos-7", "rhel-7", "fedora-25", "fedora-i386", "fedora-testing", "rhel-7-4")

+    @skipImage("Newer version of ABRT required", "centos-7", "rhel-7", "fedora-25", "fedora-i386", "fedora-testing", "rhel-7-4", "rhel-7-5")

     @skipImage("ABRT not available", "debian-stable", "debian-testing", "ubuntu-stable", "ubuntu-1604", "rhel-atomic", "fedora-atomic", "continuous-atomic")

     def testAbrtDelete(self):

         b = self.browser

@@ -366,7 +366,7 @@ s.send("PRIORITY=3\\nFOO=bar\\n")'

         b.wait_not_present("#journal-entry-fields .nav")

-    @skipImage("Newer version of ABRT required", "centos-7", "rhel-7", "fedora-25", "fedora-i386", "fedora-testing", "rhel-7-4")

+    @skipImage("Newer version of ABRT required", "centos-7", "rhel-7", "fedora-25", "fedora-i386", "fedora-testing", "rhel-7-4", "rhel-7-5")

     @skipImage("ABRT not available", "debian-stable", "debian-testing", "ubuntu-stable", "ubuntu-1604", "rhel-atomic", "fedora-atomic", "continuous-atomic")

     def testAbrtReport(self):

         # The testing server is located at verify/files/mock-faf-server.py

diff --git a/test/verify/check-networking-settings b/test/verify/check-networking-settings

index b3727b9..349337c 100755

--- a/test/verify/check-networking-settings

+++ b/test/verify/check-networking-settings

@@ -86,7 +86,7 @@ class TestNetworking(NetworkCase):

         iface = self.add_iface()

         con_id = self.iface_con_id(iface)

-        m.execute("nmcli con mod '%s' ipv4.dhcp-hostname foo" % con_id)

+        m.execute("nmcli con mod '%s' connection.gateway-ping-timeout 12" % con_id)

         self.login_and_go("/network")

         self.wait_for_iface(iface)

@@ -103,8 +103,8 @@ class TestNetworking(NetworkCase):

         self.assertEqual(m.execute("nmcli -m tabular -t -f ipv4.method con show '%s'" % con_id).strip(),

                          "shared")

-        self.assertEqual(m.execute("nmcli -m tabular -t -f ipv4.dhcp-hostname con show '%s'" % con_id).strip(),

-                         "foo")

+        self.assertEqual(m.execute("nmcli -m tabular -t -f connection.gateway-ping-timeout con show '%s'" % con_id).strip(),

+                         "12")

 if __name__ == '__main__':

     test_main()

diff --git a/test/verify/check-ostree b/test/verify/check-ostree

index b405321..b1f792f 100755

--- a/test/verify/check-ostree

+++ b/test/verify/check-ostree

@@ -114,7 +114,7 @@ def rhsmcertd_hack(m):

     m.execute("systemctl stop rhsmcertd || true")

-@skipImage("No OSTree available", "centos-7", "debian-stable", "debian-testing", "fedora-25", "fedora-26", "fedora-27", "fedora-testing", "fedora-i386", "rhel-7", "rhel-7-4", "ubuntu-1604", "ubuntu-stable")

+@skipImage("No OSTree available", "centos-7", "debian-stable", "debian-testing", "fedora-25", "fedora-26", "fedora-27", "fedora-testing", "fedora-i386", "rhel-7", "rhel-7-4", "rhel-7-5", "ubuntu-1604", "ubuntu-stable")

 class OstreeRestartCase(MachineCase):

     provision = {

         "machine1": { "address": "10.111.113.2/20", "dns": "10.111.113.2" }

@@ -415,7 +415,7 @@ class OstreeRestartCase(MachineCase):

         self.allow_restart_journal_messages()

-@skipImage("No OSTree available", "centos-7", "debian-stable", "debian-testing", "fedora-25", "fedora-26", "fedora-27", "fedora-testing", "fedora-i386", "rhel-7", "rhel-7-4", "ubuntu-1604", "ubuntu-stable")

+@skipImage("No OSTree available", "centos-7", "debian-stable", "debian-testing", "fedora-25", "fedora-26", "fedora-27", "fedora-testing", "fedora-i386", "rhel-7", "rhel-7-4", "rhel-7-5", "ubuntu-1604", "ubuntu-stable")

 class OstreeCase(MachineCase):

     provision = {

         "machine1": { "address": "10.111.113.2/20", "dns": "10.111.113.2" }

diff --git a/test/verify/check-packagekit b/test/verify/check-packagekit

index df4ecfb..bb58fab 100755

--- a/test/verify/check-packagekit

+++ b/test/verify/check-packagekit

@@ -550,7 +550,7 @@ class TestUpdatesSubscriptions(PackageCase):

         self.candlepin.execute("systemctl start tomcat")

         # remove all existing products (RHEL server), as we can't control them

-        m.execute("rm /etc/pki/product-default/*.pem /etc/pki/product/*.pem")

+        m.execute("rm -f /etc/pki/product-default/*.pem /etc/pki/product/*.pem")

         # download product info from the candlepin machine and install it

         product_file = os.path.join(self.tmpdir, "88888.pem")

@@ -656,7 +656,7 @@ class TestAutoUpdates(PackageCase):

             self.backend = "apt"

         elif self.machine.image.startswith("fedora"):

             self.backend = "dnf"

-        elif self.machine.image in ["centos-7", "rhel-7", "rhel-7-4"]:

+        elif self.machine.image in ["centos-7", "rhel-7", "rhel-7-4", "rhel-7-5"]:

             self.backend = "yum"

         else:

             raise NotImplementedError("unknown image " + self.machine.image)

diff --git a/test/verify/check-storage-format b/test/verify/check-storage-format

index 2d8a6ac..de5206c 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", "rhel-7-4", "centos-7" ]:

+        if not m.image in [ "rhel-7", "rhel-7-4", "rhel-7-5", "centos-7" ]:

             check_type("ntfs")

 if __name__ == '__main__':

diff --git a/test/verify/check-storage-iscsi b/test/verify/check-storage-iscsi

index 9127fe1..8f1b1a2 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 in ["rhel-7", "rhel-7-4"]:

+        if m.image in ["rhel-7", "rhel-7-4", "rhel-7-5"]:

             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 0031bb6..7353297 100755

--- a/test/verify/check-system-info

+++ b/test/verify/check-system-info

@@ -252,7 +252,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-7-4", "rhel-atomic")

+    @skipImage("No NTP servers config", "centos-7", "continuous-atomic", "rhel-7", "rhel-7-4", "rhel-7-5", "rhel-atomic")

     def testTimeServers(self):

         m = self.machine

         b = self.browser

-- 

2.14.3