[PATCH 2/2] Update lvm devicelibs tests to reflect recent changes.
David Lehman
dlehman at redhat.com
Mon Mar 31 18:10:13 UTC 2014
---
tests/devicelibs_test/lvm_test.py | 20 +++++++++++---------
1 file changed, 11 insertions(+), 9 deletions(-)
diff --git a/tests/devicelibs_test/lvm_test.py b/tests/devicelibs_test/lvm_test.py
index 91b71f6..f627089 100755
--- a/tests/devicelibs_test/lvm_test.py
+++ b/tests/devicelibs_test/lvm_test.py
@@ -57,7 +57,7 @@ class LVMAsRootTestCase(baseclass.DevicelibsTestCase):
try:
lvm.vgdeactivate(self._vg_name)
- lvm.vgreduce(self._vg_name, [], rm=True)
+ lvm.vgreduce(self._vg_name, None, missing=True)
except lvm.LVMError:
pass
@@ -138,11 +138,11 @@ class LVMAsRootTestCase(baseclass.DevicelibsTestCase):
## vgreduce
##
# pass
- self.assertEqual(lvm.vgreduce(self._vg_name, [_LOOP_DEV1]), None)
+ self.assertEqual(lvm.vgreduce(self._vg_name, _LOOP_DEV1), None)
# fail
- self.assertRaises(lvm.LVMError, lvm.vgreduce, "wrong-vg-name", [_LOOP_DEV1])
- self.assertRaises(lvm.LVMError, lvm.vgreduce, self._vg_name, ["/not/existing/device"])
+ self.assertRaises(lvm.LVMError, lvm.vgreduce, "wrong-vg-name", _LOOP_DEV1)
+ self.assertRaises(lvm.LVMError, lvm.vgreduce, self._vg_name, "/not/existing/device")
##
## vgactivate
@@ -157,11 +157,11 @@ class LVMAsRootTestCase(baseclass.DevicelibsTestCase):
## pvinfo
##
# pass
- self.assertEqual(lvm.pvinfo(_LOOP_DEV0)["LVM2_VG_NAME"], self._vg_name)
+ self.assertEqual(lvm.pvinfo(device=_LOOP_DEV0)[_LOOP_DEV0]["LVM2_VG_NAME"], self._vg_name)
# no vg
- self.assertEqual(lvm.pvinfo(_LOOP_DEV1)["LVM2_VG_NAME"], "")
+ self.assertEqual(lvm.pvinfo(device=_LOOP_DEV1)[_LOOP_DEV1]["LVM2_VG_NAME"], "")
- self.assertEqual(lvm.pvinfo("/not/existing/device"), {})
+ self.assertEqual(lvm.pvinfo(device="/not/existing/device"), {})
##
## vginfo
@@ -220,10 +220,12 @@ class LVMAsRootTestCase(baseclass.DevicelibsTestCase):
## lvs
##
# pass
- self.assertEqual(lvm.lvs(self._vg_name)["LVM2_LV_NAME"], [self._lv_name])
+ full_name = "%s-%s" % (self._vg_name, self._lv_name)
+ info = lvm.lvs(vg_name=self._vg_name)
+ self.assertEqual(info[full_name]["LVM2_LV_NAME"], self._lv_name)
# fail
- self.assertEqual(lvm.lvs("wrong-vg-name"), {})
+ self.assertEqual(lvm.lvs(vg_name="wrong-vg-name"), {})
##
## has_lvm
--
1.9.0
More information about the anaconda-patches
mailing list