From: Tony Asleson <tasleson@redhat.com>
Date: Thu, 3 Oct 2019 21:11:18 +0000 (-0500)
Subject: lvmdbustest.py: Add func. _pv_scan
X-Git-Tag: v2_03_07~103
X-Git-Url: https://sourceware.org/git/?a=commitdiff_plain;h=c5f4f2efb64944ea8a1eae0eee46069d8328324f;p=lvm2.git

lvmdbustest.py: Add func. _pv_scan
---

diff --git a/test/dbus/lvmdbustest.py b/test/dbus/lvmdbustest.py
index 497a605eb..92e433132 100755
--- a/test/dbus/lvmdbustest.py
+++ b/test/dbus/lvmdbustest.py
@@ -1314,75 +1314,36 @@ class TestDbusService(unittest.TestCase):
 		context = pyudev.Context()
 		return context.list_devices(subsystem='block', MAJOR='8')
 
-	def test_pv_scan(self):
-		devices = TestDbusService._get_devices()
-
+	def _pv_scan(self, activate, cache, device_paths, major_minors):
 		mgr = self._manager().Manager
+		return self.handle_return(
+			mgr.PvScan(
+				dbus.Boolean(activate),
+				dbus.Boolean(cache),
+				dbus.Array(device_paths, 's'),
+				dbus.Array(major_minors, '(ii)'),
+				dbus.Int32(g_tmo),
+				EOD))
 
-		self.assertEqual(
-			self.handle_return(
-				mgr.PvScan(
-					dbus.Boolean(False),
-					dbus.Boolean(True),
-					dbus.Array([], 's'),
-					dbus.Array([], '(ii)'),
-					dbus.Int32(g_tmo),
-					EOD)), '/')
+	def test_pv_scan(self):
+		devices = TestDbusService._get_devices()
 
+		self.assertEqual(self._pv_scan(False, True, [], []), '/')
 		self._check_consistency()
-		self.assertEqual(
-			self.handle_return(
-				mgr.PvScan(
-					dbus.Boolean(False),
-					dbus.Boolean(False),
-					dbus.Array([], 's'),
-					dbus.Array([], '(ii)'),
-					dbus.Int32(g_tmo),
-					EOD)), '/')
-
+		self.assertEqual(self._pv_scan(False, False, [], []), '/')
 		self._check_consistency()
 
-		block_path = []
-		for d in devices:
-			block_path.append(d.properties['DEVNAME'])
-
-		self.assertEqual(
-			self.handle_return(
-				mgr.PvScan(
-					dbus.Boolean(False),
-					dbus.Boolean(True),
-					dbus.Array(block_path, 's'),
-					dbus.Array([], '(ii)'),
-					dbus.Int32(g_tmo),
-					EOD)), '/')
-
+		block_path = [d.properties['DEVNAME'] for d in devices]
+		self.assertEqual(self._pv_scan(False, True, block_path, []), '/')
 		self._check_consistency()
 
-		mm = []
-		for d in devices:
-			mm.append((int(d.properties['MAJOR']), int(d.properties['MINOR'])))
-
-		self.assertEqual(
-			self.handle_return(
-				mgr.PvScan(
-					dbus.Boolean(False),
-					dbus.Boolean(True),
-					dbus.Array(block_path, 's'),
-					dbus.Array(mm, '(ii)'),
-					dbus.Int32(g_tmo),
-					EOD)), '/')
+		mm = [(int(d.properties['MAJOR']), int(d.properties['MINOR']))
+				for d in devices]
 
+		self.assertEqual(self._pv_scan(False, True, block_path, mm), '/')
 		self._check_consistency()
 
-		self.assertEqual(
-			self.handle_return(
-				mgr.PvScan(
-					dbus.Boolean(False),
-					dbus.Boolean(True),
-					dbus.Array([], 's'),
-					dbus.Array(mm, '(ii)'),
-					dbus.Int32(g_tmo),
-					EOD)), '/')
+		self.assertEqual(self._pv_scan(False, True, [], mm), '/')
 		self._check_consistency()
 
 	@staticmethod