From 93b925cc05c1b02f424ac677e9bcd522cafae1b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Doktor?= Date: Tue, 27 Nov 2018 10:43:32 +0100 Subject: [PATCH] qemu..smbios_table: Convert bytes to text MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit On py3 we need to convert results to text. Signed-off-by: Lukáš Doktor --- qemu/tests/smbios_table.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/qemu/tests/smbios_table.py b/qemu/tests/smbios_table.py index 2af359ab..a79adb4b 100644 --- a/qemu/tests/smbios_table.py +++ b/qemu/tests/smbios_table.py @@ -5,6 +5,7 @@ from avocado.utils import process from virttest import error_context from virttest import env_process from virttest import utils_misc +from virttest.compat_52lts import decode_to_text @error_context.context_aware @@ -39,8 +40,8 @@ def run(test, params, env): dmidecode_key = dmidecode_key.split() for key in dmidecode_key: cmd = (dmidecode_exp % (smbios_type_number, key)) - default_key_para = process.system_output( - cmd, shell=True).strip() + default_key_para = decode_to_text(process.system_output( + cmd, shell=True).strip()) smbios_key_para_set = params.object_params(sm_type).get(key, default_key_para) smbios += ",%s='%s'" % (key.lower(), smbios_key_para_set) @@ -87,8 +88,8 @@ def run(test, params, env): for key in dmidecode_key: cmd = (dmidecode_exp % (smbios_type_number, key)) smbios_get_para = session.cmd(cmd).strip() - default_key_para = process.system_output( - cmd, shell=True).strip() + default_key_para = decode_to_text(process.system_output( + cmd, shell=True).strip()) if params.get("smbios_type_disable", "no") == "no": smbios_set_para = params.object_params(sm_type).get(key, default_key_para) -- GitLab