Merge remote-tracking branch 'origin/pr/410'

* origin/pr/410: tests: change default LVM pool to qubes_dom0/vm-pool
QubesOS · Jun 17, 2021 · 8895571 · 8895571
2 parents 9e39f1d + 8338f7c
commit 8895571
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/qubes/tests/__init__.py b/qubes/tests/__init__.py
@@ -74,7 +74,7 @@
 if 'DEFAULT_LVM_POOL' in os.environ.keys():
     DEFAULT_LVM_POOL = os.environ['DEFAULT_LVM_POOL']
 else:
-    DEFAULT_LVM_POOL = 'qubes_dom0/pool00'
+    DEFAULT_LVM_POOL = 'qubes_dom0/vm-pool'
 
 POOL_CONF = {'name': 'test-lvm',
              'driver': 'lvm_thin',
@@ -824,7 +824,7 @@ def _find_pool(self, volume_group, thin_pool):
 
     def init_lvm_pool(self):
         volume_group, thin_pool = DEFAULT_LVM_POOL.split('/', 1)
-        path = "/dev/mapper/{!s}-{!s}".format(volume_group, thin_pool)
+        path = "/dev/mapper/{!s}-{!s}".format(volume_group, thin_pool.replace('-', '--'))
         if not os.path.exists(path):
             self.skipTest('LVM thin pool {!r} does not exist'.
                           format(DEFAULT_LVM_POOL))