[blivet:master 08/10] Add isleaf and direct to _state_functions
mulhern
amulhern at redhat.com
Tue Oct 7 13:42:29 UTC 2014
Make sure not to evaluate fstabSpec for the snapshot since it raises an
error.
Signed-off-by: mulhern <amulhern at redhat.com>
---
tests/devices_test.py | 26 +++++++++++++++++++++++++-
1 file changed, 25 insertions(+), 1 deletion(-)
diff --git a/tests/devices_test.py b/tests/devices_test.py
index f7a781f..3c6c8f3 100644
--- a/tests/devices_test.py
+++ b/tests/devices_test.py
@@ -50,10 +50,12 @@ class DeviceStateTestCase(unittest.TestCase):
def __init__(self, methodName='runTest'):
self._state_functions = {
"currentSize" : xform(lambda x, m: self.assertEqual(x, Size(0), m)),
+ "direct" : xform(self.assertTrue),
"exists" : xform(self.assertFalse),
"format" : xform(self.assertIsNotNone),
"formatArgs" : xform(lambda x, m: self.assertEqual(x, [], m)),
"isDisk" : xform(self.assertFalse),
+ "isleaf" : xform(self.assertTrue),
"major" : xform(lambda x, m: self.assertEqual(x, 0, m)),
"maxSize" : xform(lambda x, m: self.assertEqual(x, Size(0), m)),
"mediaPresent" : xform(self.assertFalse),
@@ -538,7 +540,9 @@ class BTRFSDeviceTestCase(DeviceStateTestCase):
parents=[OpticalDevice("deva",
fmt=blivet.formats.getFormat("btrfs"))])
- self.dev2 = BTRFSSubVolumeDevice("dev2", parents=[self.dev1])
+ self.dev2 = BTRFSSubVolumeDevice("dev2",
+ parents=[self.dev1],
+ fmt=blivet.formats.getFormat("btrfs"))
dev = StorageDevice("deva",
fmt=blivet.formats.getFormat("btrfs"),
@@ -553,9 +557,15 @@ class BTRFSDeviceTestCase(DeviceStateTestCase):
"""
self.stateCheck(self.dev1,
+ isleaf=xform(self.assertFalse),
parents=xform(lambda x, m: self.assertEqual(len(x), 1, m)),
type=xform(lambda x, m: self.assertEqual(x, "btrfs volume", m)))
+ self.stateCheck(self.dev2,
+ parents=xform(lambda x, m: self.assertEqual(len(x), 1, m)),
+ type=xform(lambda x, m: self.assertEqual(x, "btrfs subvolume", m)),
+ vol_id=xform(self.assertIsNone))
+
self.stateCheck(self.dev3,
currentSize=xform(lambda x, m: self.assertEqual(x, Size("32 MiB"), m)),
maxSize=xform(lambda x, m: self.assertEqual(x, Size("32 MiB"), m)),
@@ -618,6 +628,20 @@ class BTRFSDeviceTestCase(DeviceStateTestCase):
vol.exists = True
snap = BTRFSSnapShotDevice("snap1", parents=[vol], source=vol)
+ self.stateCheck(snap,
+ # FIXME: evaluation fails because Unknown format has no volUUID
+ fstabSpec=lambda d, a: True,
+ parents=xform(lambda x, m: self.assertEqual(len(x), 1, m)),
+ type=xform(lambda x, m: self.assertEqual(x, "btrfs snapshot", m)),
+ vol_id=xform(self.assertIsNone))
+ self.stateCheck(vol,
+ dataLevel=xform(self.assertIsNone),
+ exists=xform(self.assertTrue),
+ isleaf=xform(self.assertFalse),
+ metaDataLevel=xform(self.assertIsNone),
+ parents=xform(lambda x, m: self.assertEqual(len(x), 1, m)),
+ type=xform(lambda x, m: self.assertEqual(x, "btrfs volume", m)))
+
self.assertEqual(snap.isleaf, True)
self.assertEqual(snap.direct, True)
self.assertEqual(vol.isleaf, False)
--
1.9.3
More information about the anaconda-patches
mailing list