saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

test_pycrypto fix for py3.8 blowfish and mac os

Browse source
This commit is contained in:
Dmitry Kuzmenko 2020-05-14 12:57:47 +03:00 • committed by Daniel Wozniak
parent 82bcb20f5c
commit 6a6cc254c0
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
tests/unit/utils/test_pycrypto.py
View file

@ -32,7 +32,8 @@ class PycryptoTestCase(TestCase):
},
"blowfish": {
"hashed": "$2b$12$goodsaltgoodsaltgoodsOaeGcaoZ.j.ugFo3vJZv5uk3W2zf2166",
"salt": "goodsaltgoodsaltgoodsa",
"salt_crypt": "12$goodsaltgoodsaltgoodsa",
"salt_passlib": "goodsaltgoodsaltgoodsa",
"badsalt": "badsaltbadsaltbadsaltb",
},
"md5": {
@ -86,7 +87,8 @@ class PycryptoTestCase(TestCase):
default_algorithm = salt.utils.pycrypto.crypt.methods[0].name.lower()
expected = self.expecteds[default_algorithm]
ret = salt.utils.pycrypto.gen_hash(
crypt_salt=expected["salt_crypt"], password=self.passwd,
crypt_salt=expected.get("salt") or expected["salt_crypt"],
password=self.passwd,
)
self.assertEqual(ret, expected["hashed"])