storage/lvm: make the "hack" work with CallbackPool instances

CallbackPool instances are no ThinPool instances, but behave identically, if their backend driver is a ThinPool instance.
CertainLach · Jul 16, 2020 · 42d62bb · 42d62bb
1 parent 409ea88
commit 42d62bb
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/qubes/storage/lvm.py b/qubes/storage/lvm.py
@@ -509,7 +509,7 @@ def import_volume(self, src_volume):
         # HACK: neat trick to speed up testing if you have same physical thin
         # pool assigned to two qubes-pools i.e: qubes_dom0 and test-lvm
         # pylint: disable=line-too-long
-        if isinstance(src_volume.pool, ThinPool) and \
+        if hasattr(src_volume.pool, 'thin_pool') and \
                 src_volume.pool.thin_pool == self.pool.thin_pool:  # NOQA
             yield from self._commit(src_volume.path[len('/dev/'):], keep=True)
         else:

diff --git a/qubes/tests/storage_lvm.py b/qubes/tests/storage_lvm.py
@@ -792,8 +792,7 @@ def test_032_import_volume_same_pool(self):
 
         # also should be different than source volume (clone, not the same LV)
         self.assertNotEqual(uuid_after, source_uuid)
-        if VOLUME_CLASS == ThinVolume:
-            self.assertEqual(self._get_lv_origin_uuid(volume.path), source_uuid)
+        self.assertEqual(self._get_lv_origin_uuid(volume.path), source_uuid)
 
         expected_revisions = {
             '1521065906-back': '2018-03-14T22:18:26',