test: Add util.skip_if_unrecognized_version

wking · wking · commit c607380fdd8b · 2016-06-05T00:51:21.000-07:00
Almost all of our tests are going to want this, so make it really easy
to apply.

I liked the distinct TestBundle.test_root reason string a bit better,
but not enough to avoid using the new decorator for that test ;).

Signed-off-by: W. Trevor King &lt;wking@tremily.us&gt;
diff --git a/test/test_bundle.py b/test/test_bundle.py
@@ -37,10 +37,7 @@ def test_configuration(self):
         self.assertIsNotNone(
             util.CONFIG_BYTES, 'unable to read configuration JSON')
 
-    @unittest.skipIf(
-        util.VERSION not in util.VERSIONS,
-        'cannot test root-filesystem presence with configuration version {}'
-        .format(util.VERSION))
+    @util.skip_if_unrecognized_version
     @util.skip_unless_path_separator_matches
     def test_root(self):
         """The bundle directory MUST contain the root filesystem.
diff --git a/test/test_root.py b/test/test_root.py
@@ -21,9 +21,7 @@
 
 
 class TestRoot(unittest.TestCase):
-    @unittest.skipIf(
-        util.VERSION not in util.VERSIONS,
-        'cannot validate an unrecognized version')
+    @util.skip_if_unrecognized_version
     @util.skip_unless_path_separator_matches
     def test_path(self):
         """path (string, required).
@@ -47,9 +45,7 @@ def test_path(self):
         if util.VERSION == '0.5.0':
             self.assertFalse(os.path.isabs(path), 'root.path MUST be relative')
 
-    @unittest.skipIf(
-        util.VERSION not in util.VERSIONS,
-        'cannot validate an unrecognized version')
+    @util.skip_if_unrecognized_version
     def test_readonly(self):
         """readonly (bool, optional).
 
diff --git a/test/util.py b/test/util.py
@@ -58,6 +58,13 @@
             PLATFORM_OS = CONFIG_JSON.get('platform', {}).get('os')
 
 
+def skip_if_unrecognized_version(func):
+    return unittest.skipIf(
+        VERSION not in VERSIONS,
+        'cannot validate an unrecognized version'
+    )(func)
+
+
 def skip_unless_path_separator_matches(func):
     if not PLATFORM_OS:
         return unittest.skip(
