diff --git a/freezer_tempest_plugin/common.py b/freezer_tempest_plugin/common.py index 6cb4c77..cfb90ce 100644 --- a/freezer_tempest_plugin/common.py +++ b/freezer_tempest_plugin/common.py @@ -75,7 +75,10 @@ def execute(args, must_fail=False, merge_stderr=False): """ stdout = subprocess.PIPE stderr = subprocess.STDOUT if merge_stderr else subprocess.PIPE - proc = subprocess.Popen(args, stdout=stdout, stderr=stderr) + proc = subprocess.Popen(args, + stdout=stdout, + stderr=stderr, + universal_newlines=True) result, result_err = proc.communicate() if not must_fail and proc.returncode != 0: diff --git a/freezer_tempest_plugin/tests/freezer/agent/base.py b/freezer_tempest_plugin/tests/freezer/agent/base.py index c6b7697..3368bb2 100644 --- a/freezer_tempest_plugin/tests/freezer/agent/base.py +++ b/freezer_tempest_plugin/tests/freezer/agent/base.py @@ -95,7 +95,7 @@ def load_metadata(path): :param path: the path to load :return: a metadata dict """ - with open(path, 'r') as f: + with open(path, 'rb') as f: return json.load(f) @@ -172,7 +172,8 @@ class BaseFreezerTest(test.BaseTestCase): proc = subprocess.Popen(sub_process_args, stdout=subprocess.PIPE, stderr=subprocess.PIPE, - env=self.environ, shell=False) + env=self.environ, shell=False, + universal_newlines=True) out, err = proc.communicate() self.assertEqual(0, proc.returncode, diff --git a/freezer_tempest_plugin/tests/freezer/agent/test_backup_compress.py b/freezer_tempest_plugin/tests/freezer/agent/test_backup_compress.py index 170c5fc..2155048 100644 --- a/freezer_tempest_plugin/tests/freezer/agent/test_backup_compress.py +++ b/freezer_tempest_plugin/tests/freezer/agent/test_backup_compress.py @@ -85,7 +85,7 @@ class TestFreezerCompressGzip(base.BaseFreezerTest): def _metadata(self): path = os.path.join(self.storage_tree.path, 'metadata.json') - with open(path, 'r') as f: + with open(path, 'rb') as f: return json.load(f) def _file_get_mimetype(self, metadata): @@ -118,7 +118,8 @@ class TestFreezerCompressGzip(base.BaseFreezerTest): # run 'file' in brief mode to only output the values we want proc = subprocess.Popen(['file', '-b', '--mime-type', data_file_path], - stdout=subprocess.PIPE) + stdout=subprocess.PIPE, + universal_newlines=True) out, err = proc.communicate() self.assertEqual(0, proc.returncode) diff --git a/freezer_tempest_plugin/tests/freezer/agent/test_metadata_checksum.py b/freezer_tempest_plugin/tests/freezer/agent/test_metadata_checksum.py index 3a5cf2d..ff4abd7 100644 --- a/freezer_tempest_plugin/tests/freezer/agent/test_metadata_checksum.py +++ b/freezer_tempest_plugin/tests/freezer/agent/test_metadata_checksum.py @@ -82,7 +82,8 @@ class TestFreezerMetadataChecksum(base.BaseFreezerTest): process = subprocess.Popen(restore_args, stdout=subprocess.PIPE, stderr=subprocess.PIPE, - env=self.environ, shell=False) + env=self.environ, shell=False, + universal_newlines=True) out, err = process.communicate() # make sure the subprocess exist with an error due to checksum mismatch diff --git a/freezer_tempest_plugin/tests/freezerclient/base.py b/freezer_tempest_plugin/tests/freezerclient/base.py index 5cacfbb..182fcf3 100644 --- a/freezer_tempest_plugin/tests/freezerclient/base.py +++ b/freezer_tempest_plugin/tests/freezerclient/base.py @@ -68,7 +68,8 @@ class BaseFreezerTest(test.BaseTestCase): proc = subprocess.Popen(sub_process_args, stdout=subprocess.PIPE, stderr=subprocess.PIPE, - env=self.environ, shell=False) + env=self.environ, shell=False, + universal_newlines=True) out, err = proc.communicate() diff --git a/freezer_tempest_plugin/tests/freezerclient/test_freezer_cmd_action.py b/freezer_tempest_plugin/tests/freezerclient/test_freezer_cmd_action.py index 4b29f94..9262fd7 100644 --- a/freezer_tempest_plugin/tests/freezerclient/test_freezer_cmd_action.py +++ b/freezer_tempest_plugin/tests/freezerclient/test_freezer_cmd_action.py @@ -65,7 +65,7 @@ class TestFreezerCmdAction(base.BaseFreezerTest): args = ['freezer', 'action-create', '--file', self.filename] out, err = self.run_subprocess(args, "Create a new action") - action_id = err.decode().split(' ')[1] + action_id = err.split(' ')[1] args = ['freezer', 'action-show', action_id] @@ -76,7 +76,7 @@ class TestFreezerCmdAction(base.BaseFreezerTest): args = ['freezer', 'action-create', '--file', self.filename] out, err = self.run_subprocess(args, "Create a new action") - action_id = err.decode().split(' ')[1] + action_id = err.split(' ')[1] args = ['freezer', 'action-delete', action_id] diff --git a/freezer_tempest_plugin/tests/freezerclient/test_freezer_cmd_client.py b/freezer_tempest_plugin/tests/freezerclient/test_freezer_cmd_client.py index 551617a..fa04160 100644 --- a/freezer_tempest_plugin/tests/freezerclient/test_freezer_cmd_client.py +++ b/freezer_tempest_plugin/tests/freezerclient/test_freezer_cmd_client.py @@ -26,6 +26,7 @@ class TestFreezerCmdClient(base.BaseFreezerTest): super(TestFreezerCmdClient, self).setUp() test_clinet_id = '{"project_id": "tecs",\ "client_id": "test-tenant_5253_test-hostname_19544",\ + "hostname": "test-hostname_19544",\ "description": "some usefule text here",\ "config_id": "config_id_contains_uuid_of_config"\ }' diff --git a/freezer_tempest_plugin/tests/scheduler/base.py b/freezer_tempest_plugin/tests/scheduler/base.py index 8dc96d7..0d0b57b 100644 --- a/freezer_tempest_plugin/tests/scheduler/base.py +++ b/freezer_tempest_plugin/tests/scheduler/base.py @@ -68,7 +68,8 @@ class BaseFreezerTest(test.BaseTestCase): proc = subprocess.Popen(sub_process_args, stdout=subprocess.PIPE, stderr=subprocess.PIPE, - env=self.environ, shell=False) + env=self.environ, shell=False, + universal_newlines=True) out, err = proc.communicate()