From a8e2f3111d5991e9e22dddb744c655c2c16cc3ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= Date: Tue, 25 Jul 2017 05:42:39 +0200 Subject: [PATCH] tests: fix removing LVM volumes VM volumes have 'vm-' name prefix now. This is continuation of fd5386c storage/lvm: prefix VM LVM volumes with 'vm-' --- qubes/tests/__init__.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/qubes/tests/__init__.py b/qubes/tests/__init__.py index 3ba1b0b5..8645ce9f 100644 --- a/qubes/tests/__init__.py +++ b/qubes/tests/__init__.py @@ -756,11 +756,11 @@ class SystemTestCase(QubesTestCase): volumes = subprocess.check_output( ['sudo', 'lvs', '--noheadings', '-o', 'vg_name,name', '--separator', '/']).decode() - if ('/' + prefix) not in volumes: + if ('/vm-' + prefix) not in volumes: return subprocess.check_call(['sudo', 'lvremove', '-f'] + [vol.strip() for vol in volumes.splitlines() - if ('/' + prefix) in vol], + if ('/vm-' + prefix) in vol], stdout=subprocess.DEVNULL) except subprocess.CalledProcessError: pass