shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2025-02-24 17:57:48 +03:00
Code Releases Activity

lvmdbustest.py: Re-name validation function

Browse Source 
Make this name generic as we can use for different types.
This commit is contained in:
Tony Asleson 2017-03-01 17:22:32 -06:00
parent 10c3d94159
commit 4c89d3794c
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
test/dbus/lvmdbustest.py
View File

@ -229,7 +229,7 @@ class TestDbusService(unittest.TestCase):
dbus.Int32(g_tmo),
EOD))
self._validate_vg_lookup(vg_name, vg_path)
self._validate_lookup(vg_name, vg_path)
self.assertTrue(vg_path is not None and len(vg_path) > 0)
return ClientProxy(self.bus, vg_path, interfaces=(VG_INT, ))
@ -343,9 +343,10 @@ class TestDbusService(unittest.TestCase):
return self.objs[MANAGER_INT][0].\
Manager.LookUpByLvmId(dbus.String(lvm_id))
def _validate_vg_lookup(self, vg_name, object_path):
t = self._lookup(vg_name)
self.assertTrue(object_path == t, "%s != %s" % (object_path, t))
def _validate_lookup(self, lvm_name, object_path):
t = self._lookup(lvm_name)
self.assertTrue(
object_path == t, "%s != %s for %s" % (object_path, t, lvm_name))
def test_lookup_by_lvm_id(self):
# For the moment lets just lookup what we know about which is PVs
@ -932,7 +933,7 @@ class TestDbusService(unittest.TestCase):
self.assertTrue(vg_job and len(vg_job) > 0)
vg_path = self._wait_for_job(vg_job)
self._validate_vg_lookup(vg_name, vg_path)
self._validate_lookup(vg_name, vg_path)
def _test_expired_timer(self, num_lvs):
rc = False
@ -1521,7 +1522,7 @@ class TestDbusService(unittest.TestCase):
dbus.Array(pv_paths, 'o'),
dbus.Int32(g_tmo),
EOD))
self._validate_vg_lookup(vg_name, vg_path)
self._validate_lookup(vg_name, vg_path)
vg_proxy = ClientProxy(self.bus, vg_path, interfaces=(VG_INT, ))
@ -1575,7 +1576,7 @@ class TestDbusService(unittest.TestCase):
dbus.Array(pv_paths, 'o'),
dbus.Int32(g_tmo),
EOD))
self._validate_vg_lookup(vg_name, vg_path)
self._validate_lookup(vg_name, vg_path)
vg_proxy = ClientProxy(self.bus, vg_path, interfaces=(VG_INT, ))
@ -1606,7 +1607,7 @@ class TestDbusService(unittest.TestCase):
dbus.Array(pv_paths, 'o'),
dbus.Int32(g_tmo),
EOD))
self._validate_vg_lookup(vg_name, vg_path)
self._validate_lookup(vg_name, vg_path)
vg_proxy = ClientProxy(self.bus, vg_path, interfaces=(VG_INT, ))
for i in range(1, 64):
@ -1639,7 +1640,7 @@ class TestDbusService(unittest.TestCase):
dbus.Array(pv_paths, 'o'),
dbus.Int32(g_tmo),
EOD))
self._validate_vg_lookup(vg_name, vg_path)
self._validate_lookup(vg_name, vg_path)
vg_proxy = ClientProxy(self.bus, vg_path, interfaces=(VG_INT, ))
tag = '--h/K.6g0A4FOEatf3+k_nI/Yp&L_u2oy-=j649x:+dUcYWPEo6.IWT0c'