Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update test_gen_hash for macosx #53491

Merged
merged 6 commits into from Jun 19, 2019
Merged

Update test_gen_hash for macosx #53491

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0832b49
Update test_gen_hash for macosx
Ch3LL Jun 14, 2019
775b8c2
Merge branch '2019.2.1' into crypt_test_mac
dwoz Jun 14, 2019
832ded6
Merge branch '2019.2.1' into crypt_test_mac
Ch3LL Jun 17, 2019
4ce7fb1
Merge branch '2019.2.1' into crypt_test_mac
garethgreenaway Jun 18, 2019
700338e
Merge branch '2019.2.1' into crypt_test_mac
Ch3LL Jun 18, 2019
85e96bd
Merge branch '2019.2.1' into crypt_test_mac
garethgreenaway Jun 19, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 6 additions & 3 deletions tests/unit/utils/test_pycrypto.py
View file
Open in desktop
Expand Up @@ -26,14 +26,17 @@ def test_gen_hash(self):
Test gen_hash
'''
passwd = 'test_password'
id = '$'
if salt.utils.platform.is_darwin():
id = ''
ret = salt.utils.pycrypto.gen_hash(password=passwd)
self.assertTrue(ret.startswith('$6$'))
self.assertTrue(ret.startswith('$6{0}'.format(id)))

ret = salt.utils.pycrypto.gen_hash(password=passwd, algorithm='md5')
self.assertTrue(ret.startswith('$1$'))
self.assertTrue(ret.startswith('$1{0}'.format(id)))

ret = salt.utils.pycrypto.gen_hash(password=passwd, algorithm='sha256')
self.assertTrue(ret.startswith('$5$'))
self.assertTrue(ret.startswith('$5{0}'.format(id)))

def test_secure_password(self):
'''
Expand Down