[blivet:f21-branch 12/14] Add a test for mddetail on containers.

mulhern amulhern at redhat.com
Mon Sep 29 17:22:59 UTC 2014


Signed-off-by: mulhern <amulhern at redhat.com>
---
 tests/devicelibs_test/mdraid_interrogate_test.py | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/tests/devicelibs_test/mdraid_interrogate_test.py b/tests/devicelibs_test/mdraid_interrogate_test.py
index 0909fe3..2178d79 100755
--- a/tests/devicelibs_test/mdraid_interrogate_test.py
+++ b/tests/devicelibs_test/mdraid_interrogate_test.py
@@ -174,6 +174,13 @@ class MDDetailTestCase(MDRaidInterrogateTestCase):
         'WORKING DEVICES'
     ]
 
+    names_container = [
+        'RAID LEVEL',
+        'WORKING DEVICES',
+        'VERSION',
+        'TOTAL DEVICES'
+    ]
+
     def _testMDDetail(self, names, metadataVersion=None, level=None, spares=0):
         """ Test mddetail for a specified metadataVersion.
 
@@ -197,15 +204,17 @@ class MDDetailTestCase(MDRaidInterrogateTestCase):
         self._matchNames(info.keys(), names, ['RESYNC STATUS'])
 
         # check names with predictable values
-        self.assertEqual(info['ACTIVE DEVICES'], str(len(self.loopDevices) - spares))
-        self.assertEqual(info['FAILED DEVICES'], '0')
         self.assertEqual(info['RAID LEVEL'], str(level))
-        self.assertEqual(info['SPARE DEVICES'], str(spares))
         self.assertEqual(info['TOTAL DEVICES'], str(len(self.loopDevices)))
         self.assertEqual(info['WORKING DEVICES'], str(len(self.loopDevices)))
 
-        # verify that uuid is in canonical form
-        self.assertEqual(str(uuid.UUID(info['UUID'])), info['UUID'])
+        if level is not raid.Container:
+            self.assertEqual(info['ACTIVE DEVICES'], str(len(self.loopDevices) - spares))
+            self.assertEqual(info['FAILED DEVICES'], '0')
+            self.assertEqual(info['SPARE DEVICES'], str(spares))
+
+            # verify that uuid is in canonical form
+            self.assertEqual(str(uuid.UUID(info['UUID'])), info['UUID'])
 
     def testMDDetail(self):
         self._testMDDetail(self.names)
@@ -224,5 +233,8 @@ class MDDetailTestCase(MDRaidInterrogateTestCase):
         with self.assertRaisesRegexp(MDRaidError, "mddetail failed"):
             mdraid.mddetail(self.loopDevices[0])
 
+    def testMDDetailContainerDefault(self):
+        self._testMDDetail(self.names_container, level="container")
+
 if __name__ == "__main__":
     unittest.main()
-- 
1.9.3



More information about the anaconda-patches mailing list