1 files changed, 5 insertions, 35 deletions
diff --git a/tests/vmtests/test_mdadm_bcache.py b/tests/vmtests/test_mdadm_bcache.py
index 9819ebf7..f8d3e6ab 100644
--- a/tests/vmtests/test_mdadm_bcache.py
+++ b/tests/vmtests/test_mdadm_bcache.py
@@ -151,10 +151,6 @@ class BionicTestMdadmBcache(relbase.bionic, TestMdadmBcacheAbs):
     __test__ = True
 
 
-class DiscoTestMdadmBcache(relbase.disco, TestMdadmBcacheAbs):
-    __test__ = True
-
-
 class EoanTestMdadmBcache(relbase.eoan, TestMdadmBcacheAbs):
     __test__ = True
 
@@ -162,6 +158,10 @@ class EoanTestMdadmBcache(relbase.eoan, TestMdadmBcacheAbs):
 class FocalTestMdadmBcache(relbase.focal, TestMdadmBcacheAbs):
     __test__ = True
 
+    @TestMdadmBcacheAbs.skip_by_date("1861941", fixby="2020-04-15")
+    def test_fstab(self):
+        return super().test_fstab()
+
 
 class TestMirrorbootAbs(TestMdadmAbs):
     # alternative config for more complex setup
@@ -200,10 +200,6 @@ class BionicTestMirrorboot(relbase.bionic, TestMirrorbootAbs):
     __test__ = True
 
 
-class DiscoTestMirrorboot(relbase.disco, TestMirrorbootAbs):
-    __test__ = True
-
-
 class EoanTestMirrorboot(relbase.eoan, TestMirrorbootAbs):
     __test__ = True
 
@@ -223,7 +219,7 @@ class TestMirrorbootPartitionsAbs(TestMdadmAbs):
 
     def get_fstab_expected(self):
         return [
-            (self._kname_to_uuid_devpath('md-uuid', 'md0'), '/', 'defaults')
+            (self._kname_to_uuid_devpath('md-uuid', 'md0p1'), '/', 'defaults')
         ]
 
 
@@ -252,11 +248,6 @@ class BionicTestMirrorbootPartitions(relbase.bionic,
     __test__ = True
 
 
-class DiscoTestMirrorbootPartitions(relbase.disco,
-                                    TestMirrorbootPartitionsAbs):
-    __test__ = True
-
-
 class EoanTestMirrorbootPartitions(relbase.eoan,
                                    TestMirrorbootPartitionsAbs):
     __test__ = True
@@ -315,11 +306,6 @@ class BionicTestMirrorbootPartitionsUEFI(relbase.bionic,
     __test__ = True
 
 
-class DiscoTestMirrorbootPartitionsUEFI(relbase.disco,
-                                        TestMirrorbootPartitionsUEFIAbs):
-    __test__ = True
-
-
 class EoanTestMirrorbootPartitionsUEFI(relbase.eoan,
                                        TestMirrorbootPartitionsUEFIAbs):
     __test__ = True
@@ -367,10 +353,6 @@ class BionicTestRaid5boot(relbase.bionic, TestRaid5bootAbs):
     __test__ = True
 
 
-class DiscoTestRaid5boot(relbase.disco, TestRaid5bootAbs):
-    __test__ = True
-
-
 class EoanTestRaid5boot(relbase.eoan, TestRaid5bootAbs):
     __test__ = True
 
@@ -432,10 +414,6 @@ class BionicTestRaid6boot(relbase.bionic, TestRaid6bootAbs):
     __test__ = True
 
 
-class DiscoTestRaid6boot(relbase.disco, TestRaid6bootAbs):
-    __test__ = True
-
-
 class EoanTestRaid6boot(relbase.eoan, TestRaid6bootAbs):
     __test__ = True
 
@@ -483,10 +461,6 @@ class BionicTestRaid10boot(relbase.bionic, TestRaid10bootAbs):
     __test__ = True
 
 
-class DiscoTestRaid10boot(relbase.disco, TestRaid10bootAbs):
-    __test__ = True
-
-
 class EoanTestRaid10boot(relbase.eoan, TestRaid10bootAbs):
     __test__ = True
 
@@ -591,10 +565,6 @@ class BionicTestAllindata(relbase.bionic, TestAllindataAbs):
     __test__ = True
 
 
-class DiscoTestAllindata(relbase.disco, TestAllindataAbs):
-    __test__ = True
-
-
 class EoanTestAllindata(relbase.eoan, TestAllindataAbs):
     __test__ = True