From d2a46346d3ccb2ead8c9b09d3d33d72f86311360 Mon Sep 17 00:00:00 2001 From: Caihui Date: Mon, 29 Jun 2020 04:31:15 -0700 Subject: [PATCH] Fix a bug to support python3.x The default type of the string is str in python3.x, if want use the type of byte ,should be delcare b'xxxx' . Change-Id: Ia03aef1f5e51403f5ef1fdba65d0fa231b8889fd --- freezer/tests/unit/utils/test_crypt.py | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/freezer/tests/unit/utils/test_crypt.py b/freezer/tests/unit/utils/test_crypt.py index 58129fb3..1fc7aa2a 100644 --- a/freezer/tests/unit/utils/test_crypt.py +++ b/freezer/tests/unit/utils/test_crypt.py @@ -13,7 +13,6 @@ # limitations under the License. import shutil -import sys import tempfile import unittest @@ -62,16 +61,16 @@ class AESCipherTestCase(unittest.TestCase): passwd = crypt.AESCipher._get_pass_from_file(pfile) self.assertEqual(passwd, '78f40f2c57eee727a4be179049cecf89') - @unittest.skipIf(sys.version_info.major == 3, - 'Not supported on python v 3.x') +# @unittest.skipIf(sys.version_info.major == 3, +# 'Not supported on python v 3.x') def test_derive_key_and_iv(self): - passwd = 'ababab' - salt = 'a' + passwd = b'ababab' + salt = b'a' ret1, ret2 = crypt.AESCipher._derive_key_and_iv(password=passwd, salt=salt, key_length=10, iv_length=5) - expect1 = '\xb3J5\xce\xd4b\x87\xce\xe0:' - expect2 = '\x93\xc9\x9d\x03\x00' + expect1 = b'\xb3J5\xce\xd4b\x87\xce\xe0:' + expect2 = b'\x93\xc9\x9d\x03\x00' self.assertEqual(ret1, expect1) self.assertEqual(ret2, expect2)