Fix some python3 compatility
Change-Id: I8cbcdbc175fbc37e1ebe2c53023abcc2aec9d28f
This commit is contained in:
parent
9c55a840cb
commit
acd6893d0a
|
@ -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,
|
||||
|
|
|
@ -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)
|
||||
|
|
Loading…
Reference in New Issue