]> sourceware.org Git - lvm2.git/commitdiff
lvmdbustest.py: Remove duplicate setup code
authorTony Asleson <tasleson@redhat.com>
Thu, 3 Oct 2019 19:55:51 +0000 (14:55 -0500)
committerTony Asleson <tasleson@redhat.com>
Wed, 30 Oct 2019 15:38:40 +0000 (10:38 -0500)
Remove the same copy & pasted code which simply creates a VG to
use.

test/dbus/lvmdbustest.py

index 31dc4ffa20efb15bf4d054b15a0a7d53adc42994..da1fc69dc6874de7655a7b5eebb29e346c5f8cd6 100755 (executable)
@@ -1697,19 +1697,7 @@ class TestDbusService(unittest.TestCase):
                return ''.join(bad_tag_ch_set)
 
        def test_invalid_tags(self):
-               mgr = self.objs[MANAGER_INT][0].Manager
-               pv_paths = [self.objs[PV_INT][0].object_path]
-               vg_name = vg_n()
-
-               vg_path = self.handle_return(
-                       mgr.VgCreate(
-                               dbus.String(vg_name),
-                               dbus.Array(pv_paths, 'o'),
-                               dbus.Int32(g_tmo),
-                               EOD))
-               self._validate_lookup(vg_name, vg_path)
-
-               vg_proxy = ClientProxy(self.bus, vg_path, interfaces=(VG_INT, ))
+               vg_proxy = self._vg_create()
 
                for c in self._invalid_tag_characters():
                        with self.assertRaises(dbus.exceptions.DBusException):
@@ -1728,18 +1716,7 @@ class TestDbusService(unittest.TestCase):
                                                EOD))
 
        def test_tag_names(self):
-               mgr = self.objs[MANAGER_INT][0].Manager
-               pv_paths = [self.objs[PV_INT][0].object_path]
-               vg_name = vg_n()
-
-               vg_path = self.handle_return(
-                       mgr.VgCreate(
-                               dbus.String(vg_name),
-                               dbus.Array(pv_paths, 'o'),
-                               dbus.Int32(g_tmo),
-                               EOD))
-               self._validate_lookup(vg_name, vg_path)
-               vg_proxy = ClientProxy(self.bus, vg_path, interfaces=(VG_INT, ))
+               vg_proxy = self._vg_create()
 
                for i in range(1, 64):
                        tag = rs(i, "", self._ALLOWABLE_TAG_CH)
@@ -1761,18 +1738,7 @@ class TestDbusService(unittest.TestCase):
                                "%d != %d" % (i, len(vg_proxy.Vg.Tags)))
 
        def test_tag_regression(self):
-               mgr = self.objs[MANAGER_INT][0].Manager
-               pv_paths = [self.objs[PV_INT][0].object_path]
-               vg_name = vg_n()
-
-               vg_path = self.handle_return(
-                       mgr.VgCreate(
-                               dbus.String(vg_name),
-                               dbus.Array(pv_paths, 'o'),
-                               dbus.Int32(g_tmo),
-                               EOD))
-               self._validate_lookup(vg_name, vg_path)
-               vg_proxy = ClientProxy(self.bus, vg_path, interfaces=(VG_INT, ))
+               vg_proxy = self._vg_create()
 
                tag = '--h/K.6g0A4FOEatf3+k_nI/Yp&L_u2oy-=j649x:+dUcYWPEo6.IWT0c'
 
This page took 0.037481 seconds and 5 git commands to generate.