X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=functest%2Futils%2Ffunctest_utils.py;h=42c1edc9b4fa6bab4d0360d77e10c9b827cafae1;hb=3eff463f11330ea1b5cddd250d59e6b207cdde8e;hp=b49337de2a88d850410060974b8bd3b2e1350128;hpb=1a00b9de56ef65eef2a0b269a514cb25491ac54b;p=functest.git diff --git a/functest/utils/functest_utils.py b/functest/utils/functest_utils.py index b49337de2..42c1edc9b 100644 --- a/functest/utils/functest_utils.py +++ b/functest/utils/functest_utils.py @@ -43,9 +43,9 @@ def execute_command(cmd, info=False, error_msg="", ofd = open(output_file, "w") for line in iter(popen.stdout.readline, b''): if output_file: - ofd.write(line) + ofd.write(line.decode("utf-8")) else: - line = line.replace('\n', '') + line = line.decode("utf-8").replace('\n', '') print(line) sys.stdout.flush() if output_file: @@ -111,8 +111,10 @@ def get_openstack_version(cloud): version = get_nova_version(cloud) try: assert version - if version > (2, 65): + if version > (2, 72): osversion = "Master" + elif version > (2, 65): + osversion = "Stein" elif version > (2, 60): osversion = "Rocky" elif version > (2, 53):