Merge ~raharper/curtin:fix/dont-check-multi-bcache-dnames into curtin:master

[Ryan Harper]

vmtest: skip some bcache tests pending kernel fixes

There are a few kernel bugs related to bcache which prevent testing of
some bcache scenarios, add skip_by_date for bug 1728742 and bug 1754581.

vmtest: skip some bcache tests pending kernel fixes

There are a few kernel bugs related to bcache which prevent testing of
some bcache scenarios, add skip_by_date for bug 1728742 and bug 1754581.

[Server Team CI bot (server-team-bot)]

PASSED: Continuous integration, rev:5994d6c4daeb57d13b7ae35fd934754090b19d8b
https://jenkins.ubuntu.com/server/job/curtin-ci/880/
Executed test runs:
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-amd64/880
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-arm64/880
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-ppc64el/880
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-s390x/880

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/curtin-ci/880/rebuild

review: Approve (continuous-integration)

[Scott Moser (smoser)]

An upstream commit landed for this bug.

To view that commit see the following URL:
https://git.launchpad.net/curtin/commit/?id=65ceb308

diff --git a/tests/vmtests/__init__.py b/tests/vmtests/__init__.py
index 0ff35d6..fac9a2a 100644
--- a/tests/vmtests/__init__.py
+++ b/tests/vmtests/__init__.py
@@ -1282,8 +1282,10 @@ class VMBaseClass(TestCase):
                         self.assertEqual(fstab_entry.split(' ')[1],
                                          mntpoint)
 
-    def test_dname(self):
-        if self.disk_to_check is None:
+    def test_dname(self, disk_to_check=None):
+        if not disk_to_check:
+            disk_to_check = self.disk_to_check
+        if disk_to_check is None:
             return
         path = self.collect_path("ls_dname")
         if not os.path.exists(path):
diff --git a/tests/vmtests/test_mdadm_bcache.py b/tests/vmtests/test_mdadm_bcache.py
index e34d84b..b0e8c8c 100644
--- a/tests/vmtests/test_mdadm_bcache.py
+++ b/tests/vmtests/test_mdadm_bcache.py
@@ -47,9 +47,10 @@ class TestMdadmBcacheAbs(TestMdadmAbs):
                      ('main_disk', 4),
                      ('main_disk', 5),
                      ('main_disk', 6),
-                     ('md0', 0),
-                     ('cached_array', 0),
-                     ('cached_array_2', 0)]
+                     ('md0', 0)]
+    bcache_dnames = [('cached_array', 0),
+                     ('cached_array_2', 0),
+                     ('cached_array_3', 0)]
     extra_disks = ['4G', '4G', '4G', '4G', '4G']
     collect_scripts = TestMdadmAbs.collect_scripts + [textwrap.dedent("""
         cd OUTPUT_COLLECT_D
@@ -117,10 +118,19 @@ class TestMdadmBcacheAbs(TestMdadmAbs):
         self.check_file_regex("bcache_cache_mode", r"\[writethrough\]")
         self.check_file_regex("bcache_cache_mode", r"\[writearound\]")
 
+    def test_bcache_dnames(self):
+        self.skip_by_date("1728742", fixby="2018-04-26")
+        self.test_dname(disk_to_check=self.bcache_dnames)
+
 
 class TrustyTestMdadmBcache(relbase.trusty, TestMdadmBcacheAbs):
     __test__ = True
 
+    @classmethod
+    def setUpClass(cls):
+        cls.skip_by_date("1754581", fixby="2018-06-22")
+        super().setUpClass()
+
     # FIXME(LP: #1523037): dname does not work on trusty
     # when dname works on trusty, then we need to re-enable by removing line.
     def test_dname(self):
@@ -130,9 +140,17 @@ class TrustyTestMdadmBcache(relbase.trusty, TestMdadmBcacheAbs):
         print("test_ptable does not work for Trusty")
 
 
-class TrustyHWEXTestMdadmBcache(relbase.trusty_hwe_x, TrustyTestMdadmBcache):
+class TrustyHWEXTestMdadmBcache(relbase.trusty_hwe_x, TestMdadmBcacheAbs):
     __test__ = True
 
+    # FIXME(LP: #1523037): dname does not work on trusty
+    # when dname works on trusty, then we need to re-enable by removing line.
+    def test_dname(self):
+        print("test_dname does not work for Trusty")
+
+    def test_ptable(self):
+        print("test_ptable does not work for Trusty")
+
 
 class XenialGATestMdadmBcache(relbase.xenial_ga, TestMdadmBcacheAbs):
     __test__ = True