[lvm-devel] master - tests: VDO detection in dbus tests

Marian Csontos mcsontos at sourceware.org
Wed Dec 18 14:35:44 UTC 2019


Gitweb:        https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=a2a993d99558a719b0f4450e7b2fc8fc43bb5962
Commit:        a2a993d99558a719b0f4450e7b2fc8fc43bb5962
Parent:        2173bdb82177fc687474b72561742955cb292522
Author:        Marian Csontos <mcsontos at redhat.com>
AuthorDate:    Mon Dec 16 11:25:37 2019 +0100
Committer:     Marian Csontos <mcsontos at redhat.com>
CommitterDate: Mon Dec 16 12:06:42 2019 +0100

tests: VDO detection in dbus tests

---
 test/dbus/lvmdbustest.py |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/test/dbus/lvmdbustest.py b/test/dbus/lvmdbustest.py
index 522e3ca..8215968 100755
--- a/test/dbus/lvmdbustest.py
+++ b/test/dbus/lvmdbustest.py
@@ -193,11 +193,14 @@ def call_lvm(command):
 
 def supports_vdo():
 	cmd = ['segtypes']
+	modprobe = Popen(["modprobe", "kvdo"], stdout=PIPE, stderr=PIPE, close_fds=True, env=os.environ)
+	modprobe.communicate()
+	if modprobe.returncode != 0:
+		return False
 	rc, out, err = call_lvm(cmd)
-	if rc == 0:
-		if "vdo" in out:
-			return True
-	return False
+	if rc != 0 or "vdo" not in out:
+		return False
+	return True
 
 
 # noinspection PyUnresolvedReferences





More information about the lvm-devel mailing list