openstack/freezer-tempest-plugin
Code Issues Proposed changes

Merge "Fix some python3 compatility"

Browse Source
This commit is contained in:
Zuul 2020-01-16 02:14:54 +00:00 committed by Gerrit Code Review
commit 9368bd1fd3
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
freezer_tempest_plugin/tests/freezer/agent/test_backup_compress.py
View File

@ -138,7 +138,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)
@ -161,7 +161,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,
@ -181,7 +181,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,

2
freezer_tempest_plugin/tests/freezer/agent/test_metadata_checksum.py
View File

@ -92,4 +92,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)