Merge pull request #4250 from bgartzi/avoid-_get_qemu_version

Avoid  calling env_process._get_qemu_version from test cases

Author: YongxueHong

qemu/tests/cpu_info_check.py

@@ -1,7 +1,5 @@
-import re
-
 from avocado.utils import process
-from virttest import cpu, env_process, error_context, utils_misc
+from virttest import cpu, env_process, error_context, utils_misc, utils_qemu
 from virttest.utils_version import VersionInterval
 
 
@@ -45,9 +43,7 @@ def get_patterns(p_list):
     list(map(cpu_types.extend, list(cpu.CPU_TYPES.values())))
 
     qemu_path = utils_misc.get_qemu_binary(params)
-    qemu_version = env_process._get_qemu_version(qemu_path)
-    match = re.search(r"[0-9]+\.[0-9]+\.[0-9]+(\-[0-9]+)?", qemu_version)
-    host_qemu = match.group(0)
+    host_qemu = utils_qemu.get_qemu_version(qemu_path)[0]
     remove_list_deprecated = params.get("remove_list_deprecated", "")
     if host_qemu in VersionInterval("[7.0.0-8, )") and remove_list_deprecated:
         params["remove_list"] = remove_list_deprecated

qemu/tests/thin_write_in_qemu_img_commit.py

@@ -1,7 +1,6 @@
 import json
-import re
 
-from virttest import data_dir, env_process, utils_misc, utils_numeric
+from virttest import data_dir, utils_misc, utils_numeric, utils_qemu
 from virttest.qemu_io import QemuIOSystem
 from virttest.qemu_storage import QemuImg
 from virttest.utils_version import VersionInterval
@@ -44,9 +43,7 @@ def _qemu_io(img, cmd):
     def _verify_map_output(output):
         """ "Verify qemu map output."""
         qemu_path = utils_misc.get_qemu_binary(params)
-        qemu_version = env_process._get_qemu_version(qemu_path)
-        match = re.search(r"[0-9]+\.[0-9]+\.[0-9]+(\-[0-9]+)?", qemu_version)
-        host_qemu = match.group(0)
+        host_qemu = utils_qemu.get_qemu_version(qemu_path)[0]
         expected = {
             "length": int(utils_numeric.normalize_data_size(params["write_size"], "B")),
             "start": 0,