[blivet:rhel7/master 5/6] Filesystem labeling tests will not run without utilities (#1065422)

mulhern amulhern at redhat.com
Sat Feb 15 18:52:30 UTC 2014


Resolves: rhbz#1065422

Check that utilities are available before trying to run tests that use them.

It was also possible to do this in the base class of these tests,
by overriding the setUp() method, but that would have been a little less
obvious and also per-method, instead of per-class.

Signed-off-by: mulhern <amulhern at redhat.com>
---
 tests/formats_test/misc_test.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/tests/formats_test/misc_test.py b/tests/formats_test/misc_test.py
index 8347893..cdc298e 100755
--- a/tests/formats_test/misc_test.py
+++ b/tests/formats_test/misc_test.py
@@ -85,36 +85,42 @@ class MethodsTestCase(unittest.TestCase):
             if issubclass(v, fs.FS) and not v.labeling() and not issubclass(v, fs.NFS):
                 self.assertEqual(v(device="/dev", label=label).label, label)
 
+ at unittest.skipUnless(fs.XFS.utilsAvailable(), 'XFS utilities unavailable')
 class XFSTestCase(fslabeling.CompleteLabelingAsRoot):
     def setUp(self):
         self._fs_class = fs.XFS
         self._invalid_label = "root filesystem"
         super(XFSTestCase, self).setUp()
 
+ at unittest.skipUnless(fs.FATFS.utilsAvailable(), 'FATFS utilities unavailable')
 class FATFSTestCase(fslabeling.CompleteLabelingAsRoot):
     def setUp(self):
         self._fs_class = fs.FATFS
         self._invalid_label = "root___filesystem"
         super(FATFSTestCase, self).setUp()
 
+ at unittest.skipUnless(fs.Ext2FS.utilsAvailable(), 'Ext2FS utilities unavailable')
 class Ext2FSTestCase(fslabeling.CompleteLabelingAsRoot):
     def setUp(self):
         self._fs_class = fs.Ext2FS
         self._invalid_label = "root___filesystem"
         super(Ext2FSTestCase, self).setUp()
 
+ at unittest.skipUnless(fs.JFS.utilsAvailable(), 'JFS utilities unavailable')
 class JFSTestCase(fslabeling.LabelingWithRelabeling):
     def setUp(self):
         self._fs_class = fs.JFS
         self._invalid_label = "root___filesystem"
         super(JFSTestCase, self).setUp()
 
+ at unittest.skipUnless(fs.ReiserFS.utilsAvailable(), 'ReiserFS utilities unavailable')
 class ReiserFSTestCase(fslabeling.LabelingWithRelabeling):
     def setUp(self):
         self._fs_class = fs.ReiserFS
         self._invalid_label = "root___filesystem"
         super(ReiserFSTestCase, self).setUp()
 
+ at unittest.skipUnless(fs.HFS.utilsAvailable(), 'HFS utilities unavailable')
 class HFSTestCase(fslabeling.LabelingAsRoot):
     def setUp(self):
         self._fs_class = fs.HFS
-- 
1.8.3.1



More information about the anaconda-patches mailing list