From acd6893d0a6d4788853f51176bf7569ca0e66fce Mon Sep 17 00:00:00 2001 From: caihui Date: Wed, 15 Jan 2020 03:39:07 -0800 Subject: [PATCH] Fix some python3 compatility Change-Id: I8cbcdbc175fbc37e1ebe2c53023abcc2aec9d28f --- .../tests/freezer/agent/test_backup_compress.py | 6 +++--- .../tests/freezer/agent/test_metadata_checksum.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) 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 a4ad1f6..732443c 100644 --- a/freezer_tempest_plugin/tests/freezer/agent/test_backup_compress.py +++ b/freezer_tempest_plugin/tests/freezer/agent/test_backup_compress.py @@ -137,7 +137,7 @@ class TestFreezerCompressGzip(base.BaseFreezerTest): self.assertEqual('gzip', metadata['compression']) # file utility should detect the correct mimetype - gizp_mimetypes = ['application/gzip', 'application/x-gzip'] + gizp_mimetypes = [b'application/gzip', b'application/x-gzip'] mimetype = self._file_get_mimetype(metadata) self.assertIn(mimetype, gizp_mimetypes) @@ -160,7 +160,7 @@ class TestFreezerCompressGzip(base.BaseFreezerTest): self.assertEqual('bzip2', metadata['compression']) mimetype = self._file_get_mimetype(metadata) - self.assertEqual('application/x-bzip2', mimetype) + self.assertEqual(b'application/x-bzip2', mimetype) diff_args = ['diff', '-r', '-q', self.source_tree.path, @@ -180,7 +180,7 @@ class TestFreezerCompressGzip(base.BaseFreezerTest): self.assertEqual('xz', metadata['compression']) mimetype = self._file_get_mimetype(metadata) - self.assertEqual('application/x-xz', mimetype) + self.assertEqual(b'application/x-xz', mimetype) diff_args = ['diff', '-r', '-q', self.source_tree.path, 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..a9e873e 100644 --- a/freezer_tempest_plugin/tests/freezer/agent/test_metadata_checksum.py +++ b/freezer_tempest_plugin/tests/freezer/agent/test_metadata_checksum.py @@ -91,4 +91,4 @@ class TestFreezerMetadataChecksum(base.BaseFreezerTest): out, err) self.assertEqual(1, process.returncode, message) self.assertEqual('', out, message) - self.assertNotEqual('', err, message) + self.assertNotEqual(b'', err, message)