diff options
| author | Tony Asleson <tasleson@redhat.com> | 2019-10-03 14:55:51 -0500 |
|---|---|---|
| committer | Tony Asleson <tasleson@redhat.com> | 2019-10-30 10:38:40 -0500 |
| commit | 62136c056a506568ede876ce41e826478399085b (patch) | |
| tree | d1630260a6163f559a5a30fef467601075931b90 | |
| parent | 12c47e0c98a24de619af63a8756a458cf6c069b3 (diff) | |
| download | lvm2-62136c056a506568ede876ce41e826478399085b.tar.gz | |
lvmdbustest.py: Remove duplicate setup code
Remove the same copy & pasted code which simply creates a VG to
use.
| -rwxr-xr-x | test/dbus/lvmdbustest.py | 40 |
1 files changed, 3 insertions, 37 deletions
diff --git a/test/dbus/lvmdbustest.py b/test/dbus/lvmdbustest.py index 31dc4ffa2..da1fc69dc 100755 --- a/test/dbus/lvmdbustest.py +++ b/test/dbus/lvmdbustest.py @@ -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' |