From c786636afba068fc0f560b6dd1dd9dd532c35135 Mon Sep 17 00:00:00 2001 From: Tony Asleson Date: Wed, 9 Oct 2019 11:48:00 -0500 Subject: [PATCH] lvmdbustest.py: Add nested helper function major_minor --- test/dbus/lvmdbustest.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/test/dbus/lvmdbustest.py b/test/dbus/lvmdbustest.py index a9d7fac74..0b7140a89 100755 --- a/test/dbus/lvmdbustest.py +++ b/test/dbus/lvmdbustest.py @@ -1316,6 +1316,10 @@ class TestDbusService(unittest.TestCase): EOD)) def test_pv_scan(self): + + def major_minor(d): + return (int(d.properties['MAJOR']), int(d.properties['MINOR'])) + devices = TestDbusService._get_devices() self.assertEqual(self._pv_scan(False, True, [], []), '/') @@ -1327,8 +1331,7 @@ class TestDbusService(unittest.TestCase): self.assertEqual(self._pv_scan(False, True, block_path, []), '/') self._check_consistency() - mm = [(int(d.properties['MAJOR']), int(d.properties['MINOR'])) - for d in devices] + mm = [major_minor(d) for d in devices] self.assertEqual(self._pv_scan(False, True, block_path, mm), '/') self._check_consistency() -- 2.43.5