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.

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

Update test_gen_hash for macosx #53491

Merged
merged 6 commits into from Jun 19, 2019

Conversation

@Ch3LL
Copy link
Contributor

commented Jun 14, 2019

What does this PR do?

This test unit.utils.test_pycrypto.PycryptoTestCase.test_gen_hash is failing on macosx with this failure:

       Traceback (most recent call last):
         File "/private/tmp/kitchen/testing/tests/unit/utils/test_pycrypto.py", line 30, in test_gen_hash
           self.assertTrue(ret.startswith('$6$'))
       AssertionError: False is not true

This is because crypt on macosx doesn't support the $id$ format. A great explanation is shared here: https://bugs.python.org/issue22432

What issues does this PR fix or reference?

#53488

Previous Behavior

unit.utils.test_pycrypto.PycryptoTestCase.test_gen_hash test fails on macosx

New Behavior

unit.utils.test_pycrypto.PycryptoTestCase.test_gen_hash passes on macosx

Tests written?

fixes test

Commits signed with GPG?

Yes

@cmcmarrow cmcmarrow self-requested a review Jun 14, 2019
garethgreenaway and others added 3 commits Jun 18, 2019
@Ch3LL Ch3LL merged commit bdd7c2c into saltstack:2019.2.1 Jun 19, 2019
14 of 17 checks passed
14 of 17 checks passed
jenkins/pr/py2-windows-2016 The py2-windows-2016 job has failed
Details
jenkins/pr/py3-ubuntu-1804 The py3-ubuntu-1804 job has failed
Details
jenkins/pr/py3-windows-2016 The py3-windows-2016 job has failed
Details
WIP Ready for review
Details
continuous-integration/jenkins/pr-head This commit looks good
Details
jenkins/pr/docs The docs job has passed
Details
jenkins/pr/lint Python lint test has passed
Details
jenkins/pr/py2-centos-6 The py2-centos-6 job has passed
Details
jenkins/pr/py2-centos-7 The py2-centos-7 job has passed
Details
jenkins/pr/py2-debian-8 The py2-debian-8 job has passed
Details
jenkins/pr/py2-debian-9 The py2-debian-9 job has passed
Details
jenkins/pr/py2-ubuntu-1604 The py2-ubuntu-1604 job has passed
Details
jenkins/pr/py2-ubuntu-1804 The py2-ubuntu-1804 job has passed
Details
jenkins/pr/py3-centos-7 The py3-centos-7 job has passed
Details
jenkins/pr/py3-debian-8 The py3-debian-8 job has passed
Details
jenkins/pr/py3-debian-9 The py3-debian-9 job has passed
Details
jenkins/pr/py3-ubuntu-1604 The py3-ubuntu-1604 job has passed
Details
@waynew

This comment has been minimized.

Copy link
Contributor

commented Jun 19, 2019

Nice find!

dwoz added a commit that referenced this pull request Jul 22, 2019
Cherry Pick #53491 into neon
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
6 participants
You can’t perform that action at this time.