Merge lp:~raharper/curtin/trunk.skiptest-zesty-bcache into lp:~curtin-dev/curtin/trunk

[Ryan Harper]

vmtest: allow time-based skipping of tests, apply to ZestyMdadmBcache

Zesty kernel has broken bcache device names, tracked in LP: #1667078.
Allow vmtest to skip known broken tests for a period of time, raising
SkipTest from now() till some future date. Also, raise an exception if
we're skipping the test past a second date.

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

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

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

review: Approve (continuous-integration)

[Scott Moser (smoser)]

some questions, i approve if you want to pull it as it is.

[Scott Moser (smoser)]

review: Approve

=== modified file 'tests/vmtests/__init__.py'
--- tests/vmtests/__init__.py	2017-02-21 20:25:21 +0000
+++ tests/vmtests/__init__.py	2017-02-22 21:32:37 +0000
@@ -480,6 +480,17 @@
         return disks
 
     @classmethod
+    def skip_by_date(cls, clsname, release, bugnum, fixby, removeby):
+        if datetime.date.today() < datetime.date(*fixby):
+            raise SkipTest(
+                "LP: #%s not expected to be fixed in %s yet" % (bugnum,
+                                                                release))
+        if datetime.date.today() > datetime.date(*removeby):
+            raise RuntimeError(
+                "Please remove the LP: #%s workaround in %s",
+                bugnum, clsname)
+
+    @classmethod
     def setUpClass(cls):
         # check if we should skip due to host arch
         if cls.arch in cls.arch_skip:

=== modified file 'tests/vmtests/test_mdadm_bcache.py'
--- tests/vmtests/test_mdadm_bcache.py	2017-02-07 16:52:56 +0000
+++ tests/vmtests/test_mdadm_bcache.py	2017-02-22 21:32:37 +0000
@@ -144,6 +144,12 @@
 class ZestyTestMdadmBcache(relbase.zesty, TestMdadmBcacheAbs):
     __test__ = True
 
+    @classmethod
+    def setUpClass(cls):
+        cls.skip_by_date(cls.__name__, cls.release, "1667078",
+                         (2017, 3, 22), (2017, 3, 31))
+        super().setUpClass()
+
 
 class TestMirrorbootAbs(TestMdadmAbs):
     # alternative config for more complex setup