[blivet:master 02/21] Comment mdraid.mdcreate() and update tests appropriately.

mulhern amulhern at redhat.com
Sat May 17 18:50:47 UTC 2014


Signed-off-by: mulhern <amulhern at redhat.com>
---
 blivet/devicelibs/mdraid.py          | 11 +++++++++++
 tests/devicelibs_test/mdraid_test.py |  5 +++--
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/blivet/devicelibs/mdraid.py b/blivet/devicelibs/mdraid.py
index d07f7bf..aeb554c 100644
--- a/blivet/devicelibs/mdraid.py
+++ b/blivet/devicelibs/mdraid.py
@@ -114,6 +114,17 @@ def mdadm(args):
         raise MDRaidError("running mdadm " + " ".join(args) + " failed")
 
 def mdcreate(device, level, disks, spares=0, metadataVer=None, bitmap=False):
+    """ Create an mdarray from a list of devices.
+
+        :param str device: the name for the array
+        :param level: the level of the array
+        :type level: :class:`~.devicelibs.raid.RAIDLevel`
+        :param disks: the members of the array
+        :type disks: list of str
+        :param int spares: the number of spares in the array
+        :param str metadataVer: one of the mdadm metadata versions
+        :param bool bitmap: whether to create an internal bitmap on the device
+    """
     argv = ["--create", device, "--run", "--level=%s" % level]
     raid_devs = len(disks) - spares
     argv.append("--raid-devices=%d" % raid_devs)
diff --git a/tests/devicelibs_test/mdraid_test.py b/tests/devicelibs_test/mdraid_test.py
index 8de5414..73d2ff1 100755
--- a/tests/devicelibs_test/mdraid_test.py
+++ b/tests/devicelibs_test/mdraid_test.py
@@ -3,6 +3,7 @@ import os
 import unittest
 import time
 
+import blivet.devicelibs.raid as raid
 import blivet.devicelibs.mdraid as mdraid
 from blivet.errors import MDRaidError
 from blivet.size import Size
@@ -75,12 +76,12 @@ class MDRaidAsRootTestCase(baseclass.DevicelibsTestCase):
         ## mdcreate
         ##
         # pass
-        self.assertEqual(mdraid.mdcreate(self._dev_name, 1, [_LOOP_DEV0, _LOOP_DEV1]), None)
+        self.assertEqual(mdraid.mdcreate(self._dev_name, raid.RAID1, [_LOOP_DEV0, _LOOP_DEV1]), None)
         # wait for raid to settle
         time.sleep(2)
 
         # fail
-        self.assertRaises(MDRaidError, mdraid.mdcreate, "/dev/md1", 1, ["/not/existing/dev0", "/not/existing/dev1"])
+        self.assertRaises(MDRaidError, mdraid.mdcreate, "/dev/md1", raid.RAID1, ["/not/existing/dev0", "/not/existing/dev1"])
 
         ##
         ## mddeactivate
-- 
1.8.3.1



More information about the anaconda-patches mailing list