diff options
| author |   Cedric Ollivier <cedric.ollivier@orange.com> | 2019-05-24 07:15:32 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2019-05-24 07:15:32 +0000 |
| commit | fb0717f345c42b58d0c5f3cf4f8510892755ac6a (patch) | |
| tree | 3d5848a8e8e25c7cfd477c6ee25d548cda8b006d | |
| parent | b075d9a90269767a4fb83af065d706fb56688130 (diff) | |
| parent | 3a05e9fe7916eb7244e944b64f7cac514641ebb9 (diff) | |
Merge "Enable Vmtp if py3" into stable/hunter
| -rw-r--r-- | functest/opnfv_tests/openstack/vmtp/vmtp.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/functest/opnfv_tests/openstack/vmtp/vmtp.py b/functest/opnfv_tests/openstack/vmtp/vmtp.py index 3462ec063..4397e2b47 100644 --- a/functest/opnfv_tests/openstack/vmtp/vmtp.py +++ b/functest/opnfv_tests/openstack/vmtp/vmtp.py @@ -104,7 +104,7 @@ class Vmtp(singlevm.VmReady2): if not os.path.exists(self.res_dir): os.makedirs(self.res_dir) cmd = ['vmtp', '-sc'] - output = subprocess.check_output(cmd) + output = subprocess.check_output(cmd).decode() self.__logger.info("%s\n%s", " ".join(cmd), output) with open(self.config, "w+") as conf: vmtp_conf = yaml.load(output) @@ -146,11 +146,12 @@ class Vmtp(singlevm.VmReady2): cmd = ['vmtp', '-d', '--json', '{}/vmtp.json'.format(self.res_dir), '-c', self.config] output = subprocess.check_output( - cmd, stderr=subprocess.STDOUT, env=new_env) + cmd, stderr=subprocess.STDOUT, env=new_env).decode() self.__logger.info("%s\n%s", " ".join(cmd), output) cmd = ['vmtp_genchart', '-c', '{}/vmtp.html'.format(self.res_dir), '{}/vmtp.json'.format(self.res_dir)] - output = subprocess.check_output(cmd, stderr=subprocess.STDOUT) + output = subprocess.check_output( + cmd, stderr=subprocess.STDOUT).decode() self.__logger.info("%s\n%s", " ".join(cmd), output) with open('{}/vmtp.json'.format(self.res_dir), 'r') as res_file: self.details = json.load(res_file) |