Merge ~smoser/curtin:fix/skip-by-date-should-skip-on-skip into curtin:master

[Scott Moser]

vmtests: Let a raised SkipTest go through skip_by_date.

There was a general logic error in skip_by_date. If a setUpClass
raised a SkipTest and the fix-by date had not been raised then
we would swallow that SkipTest. Th result was that the test methods
would fail as the install had not been done.

We saw this specifically at the end of Artful's support. The
artful setUpClass would then raise SkipTest due to
'is_unsupported_ubuntu'. skip_by_date was swallowing that.

The change here is to just let a SkipTest bubble through the
skip_by_date wrapper.

see commit message

[Ryan Harper (raharper)]

Yes, that looks right.

review: Approve

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

FAILED: Continuous integration, rev:4f25dc5b679ed4d7adba4959bac86526dc748b80
https://jenkins.ubuntu.com/server/job/curtin-ci/995/
Executed test runs:
    FAILURE: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-arm64/995/console
    FAILURE: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-ppc64el/995/console
    FAILURE: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-s390x/995/console
    FAILURE: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=torkoal/995/console

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

review: Needs Fixing (continuous-integration)

b36e046... by Scott Moser on 2018-07-20

typo locally

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

review: Approve (continuous-integration)

diff --git a/tests/vmtests/__init__.py b/tests/vmtests/__init__.py
index 1c62723..442bd8b 100644
--- a/tests/vmtests/__init__.py
+++ b/tests/vmtests/__init__.py
@@ -441,6 +441,8 @@ def skip_by_date(bugnum, fixby, removeby=None, skips=None, install=True):
                 exc = None
                 try:
                     mycallable(*args, **kwargs)
+                except SkipTest:
+                    raise
                 except Exception as e:
                     exc = e
 
@@ -459,9 +461,7 @@ def skip_by_date(bugnum, fixby, removeby=None, skips=None, install=True):
                         raise SkipTest(msg)
                 else:
                     # Expected fixed.
-                    if isinstance(exc, SkipTest):
-                        raise SkipTest(msg)
-                    elif d_today > d_removeby:
+                    if d_today > d_removeby:
                         raise RuntimeError(msg)
                     elif exc:
                         raise RuntimeError(msg)