do a proper unittest.skip if test is not run

diff --git a/testing/test_deltatar.py b/testing/test_deltatar.py
index 9f60677..c36f92a 100644 (file)
--- a/testing/test_deltatar.py
+++ b/testing/test_deltatar.py
@@ -25,6 +25,7 @@ import binascii
 import json
 from datetime import datetime
 from functools import partial
+from unittest import skip, SkipTest
 
 from deltatar.tarfile import TarFile, GNU_FORMAT
 from deltatar.deltatar import DeltaTar, NO_MATCH, MATCH, PARENT_MATCH
@@ -190,9 +191,9 @@ class DeltaTarTest(BaseTest):
         restore it.
         '''
 
-        # this test only works for uncompressed or concat compressed modes
         if self.MODE.startswith(':') or self.MODE.startswith('|'):
-            return
+            raise SkipTest('this test only works for uncompressed '
+                           'or concat compressed modes')
 
         deltatar = DeltaTar(mode=self.MODE, password=self.PASSWORD,
                             logger=self.consoleLogger)
@@ -328,7 +329,8 @@ class DeltaTarTest(BaseTest):
         '''
         # this test only works for uncompressed or concat compressed modes
         if self.MODE.startswith(':') or self.MODE.startswith('|'):
-            return
+            raise SkipTest('this test only works for uncompressed '
+                           'or concat compressed modes')
 
         deltatar = DeltaTar(mode=self.MODE, password=self.PASSWORD,
                             logger=self.consoleLogger)
@@ -397,9 +399,9 @@ class DeltaTarTest(BaseTest):
         '''
         Restores a full backup using an index file.
         '''
-        # this test only works for uncompressed or concat compressed modes
         if self.MODE.startswith(':') or self.MODE.startswith('|'):
-            return
+            raise SkipTest('this test only works for uncompressed '
+                           'or concat compressed modes')
 
         deltatar = DeltaTar(mode=self.MODE, password=self.PASSWORD,
                             logger=self.consoleLogger)
@@ -427,9 +429,9 @@ class DeltaTarTest(BaseTest):
         '''
         Restores a full multivolume backup using an index file.
         '''
-        # this test only works for uncompressed or concat compressed modes
         if self.MODE.startswith(':') or self.MODE.startswith('|'):
-            return
+            raise SkipTest('this test only works for uncompressed '
+                           'or concat compressed modes')
 
         deltatar = DeltaTar(mode=self.MODE, password=self.PASSWORD,
                             logger=self.consoleLogger)
@@ -569,9 +571,9 @@ class DeltaTarTest(BaseTest):
         '''
         Creates a backup, and then filter when doing the index based restore.
         '''
-        # this test only works for uncompressed or concat compressed modes
         if self.MODE.startswith(':') or self.MODE.startswith('|'):
-            return
+            raise SkipTest('this test only works for uncompressed '
+                           'or concat compressed modes')
 
         deltatar = DeltaTar(mode=self.MODE, password=self.PASSWORD,
                             logger=self.consoleLogger)
@@ -605,9 +607,9 @@ class DeltaTarTest(BaseTest):
         Creates a backup, and then filter when doing the index based restore,
         using the filter function.
         '''
-        # this test only works for uncompressed or concat compressed modes
         if self.MODE.startswith(':') or self.MODE.startswith('|'):
-            return
+            raise SkipTest('this test only works for uncompressed '
+                           'or concat compressed modes')
 
         visited_paths = []
         def filter_func(visited_paths, path):
@@ -1106,9 +1108,9 @@ class DeltaTarTest(BaseTest):
         Creates a full backup, modifies some files, creates a diff backup,
         then restores the diff backup from zero.
         '''
-        # this test only works for uncompressed or concat compressed modes
         if self.MODE.startswith(':') or self.MODE.startswith('|'):
-            return
+            raise SkipTest('this test only works for uncompressed '
+                           'or concat compressed modes')
 
         deltatar = DeltaTar(mode=self.MODE, password=self.PASSWORD,
                             logger=self.consoleLogger)
@@ -1147,9 +1149,9 @@ class DeltaTarTest(BaseTest):
         Creates a full backup, modifies some files, creates a diff backup,
         then restores the diff backup with the full backup as a starting point.
         '''
-        # this test only works for uncompressed or concat compressed modes
         if self.MODE.startswith(':') or self.MODE.startswith('|'):
-            return
+            raise SkipTest('this test only works for uncompressed '
+                           'or concat compressed modes')
 
         deltatar = DeltaTar(mode=self.MODE, password=self.PASSWORD,
                             logger=self.consoleLogger)
@@ -1195,9 +1197,9 @@ class DeltaTarTest(BaseTest):
         diff backup, then restores the diff backup with the full backup as a
         starting point.
         '''
-        # this test only works for uncompressed or concat compressed modes
         if self.MODE.startswith(':') or self.MODE.startswith('|'):
-            return
+            raise SkipTest('this test only works for uncompressed '
+                           'or concat compressed modes')
 
         deltatar = DeltaTar(mode=self.MODE, password=self.PASSWORD,
                             logger=self.consoleLogger)
@@ -1266,9 +1268,9 @@ class DeltaTarTest(BaseTest):
         diff backup, then restores the diff backup with the full backup as a
         starting point.
         '''
-        # this test only works for uncompressed or concat compressed modes
         if self.MODE.startswith(':') or self.MODE.startswith('|'):
-            return
+            raise SkipTest('this test only works for uncompressed '
+                           'or concat compressed modes')
 
         deltatar = DeltaTar(mode=self.MODE, password=self.PASSWORD,
                             logger=self.consoleLogger)
@@ -1385,19 +1387,21 @@ class DeltaTarGzipStreamTest(DeltaTarTest):
     '''
     MODE = '|gz'
 
-# Commenting Bz2 tests, they are too slow..
-#class DeltaTarBz2Test(DeltaTarTest):
-    #'''
-    #Same as DeltaTar but with specific bz2 mode
-    #'''
-    #MODE = ':bz2'
 
+@skip('Bz2 tests are too slow..')
+class DeltaTarBz2Test(DeltaTarTest):
+    '''
+    Same as DeltaTar but with specific bz2 mode
+    '''
+    MODE = ':bz2'
 
-#class DeltaTarBz2StreamTest(DeltaTarTest):
-    #'''
-    #Same as DeltaTar but with specific bz2 stream mode
-    #'''
-    #MODE = '|bz2'
+
+@skip('Bz2 tests are too slow..')
+class DeltaTarBz2StreamTest(DeltaTarTest):
+    '''
+    Same as DeltaTar but with specific bz2 stream mode
+    '''
+    MODE = '|bz2'
 
 
 class DeltaTarGzipConcatTest(DeltaTarTest):