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

`libcrypto.OpenSSL_version_num` might be a callable #52842

Merged
merged 1 commit into from May 6, 2019

Conversation

@s0undt3ch
Copy link
Member

commented May 6, 2019

What does this PR do?

At least on Cryptodome, OpenSSL_version_num is a callable, account for that.

What issues does this PR fix or reference?

Fixes the following traceback:

01:41:38        Traceback (most recent call last):
01:41:38          File "/tmp/kitchen/testing/tests/support/mixins.py", line 497, in assertReturnSaltType
01:41:38            self.assertTrue(isinstance(ret, dict))
01:41:38          File "/usr/lib/python3.5/unittest/case.py", line 677, in assertTrue
01:41:38            raise self.failureException(msg)
01:41:38        AssertionError: False is not true
01:41:38        
01:41:38        During handling of the above exception, another exception occurred:
01:41:38        
01:41:38        Traceback (most recent call last):
01:41:38          File "/tmp/kitchen/testing/tests/support/mixins.py", line 554, in assertSaltTrueReturn
01:41:38            for saltret in self.__getWithinSaltReturn(ret, 'result'):
01:41:38          File "/tmp/kitchen/testing/tests/support/mixins.py", line 527, in __getWithinSaltReturn
01:41:38            self.assertReturnNonEmptySaltType(ret)
01:41:38        AssertionError: str is not dict. Salt returned: ERROR: Traceback (most recent call last):
01:41:38          File "/tmp/salt.docker.14d0ac/salt-call", line 27, in <module>
01:41:38            salt_call()
01:41:38          File "/tmp/salt.docker.14d0ac/pyall/salt/scripts.py", line 426, in salt_call
01:41:38            import salt.cli.call
01:41:38          File "/tmp/salt.docker.14d0ac/pyall/salt/cli/call.py", line 8, in <module>
01:41:38            import salt.cli.caller
01:41:38          File "/tmp/salt.docker.14d0ac/pyall/salt/cli/caller.py", line 19, in <module>
01:41:38            import salt.minion
01:41:38          File "/tmp/salt.docker.14d0ac/pyall/salt/minion.py", line 70, in <module>
01:41:38            import salt.crypt
01:41:38          File "/tmp/salt.docker.14d0ac/pyall/salt/crypt.py", line 69, in <module>
01:41:38            import salt.utils.rsax931
01:41:38          File "/tmp/salt.docker.14d0ac/pyall/salt/utils/rsax931.py", line 93, in <module>
01:41:38            libcrypto = _init_libcrypto()
01:41:38          File "/tmp/salt.docker.14d0ac/pyall/salt/utils/rsax931.py", line 69, in _init_libcrypto
01:41:38            if libcrypto.OpenSSL_version_num < 0x10100000:
01:41:38        TypeError: unorderable types: _FuncPtr() < int()
@s0undt3ch

This comment has been minimized.

Copy link
Member Author

commented May 6, 2019

re-run full all

1 similar comment
@s0undt3ch

This comment has been minimized.

Copy link
Member Author

commented May 6, 2019

re-run full all

@s0undt3ch s0undt3ch requested a review from garethgreenaway May 6, 2019
@garethgreenaway garethgreenaway merged commit cc7a0d1 into saltstack:2019.2.1 May 6, 2019
10 checks passed
10 checks passed
WIP Ready for review
Details
continuous-integration/jenkins/pr-merge 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-7 The py2-centos-7 job has passed
Details
jenkins/pr/py2-ubuntu-1604 The py2-ubuntu-1604 job has passed
Details
jenkins/pr/py2-windows-2016 The py2-windows-2016 job has passed
Details
jenkins/pr/py3-centos-7 The py3-centos-7 job has passed
Details
jenkins/pr/py3-ubuntu-1604 The py3-ubuntu-1604 job has passed
Details
jenkins/pr/py3-windows-2016 The py3-windows-2016 job has passed
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
2 participants
You can’t perform that action at this time.