valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #40810 from rallytime/fix-tls-test-failure

Browse Source 
Skip tsl unit test when we hit an error due to OpenSSL and junos-eznc packaging conflict.
This commit is contained in:
Nicole Thomas 2017-04-21 09:25:44 -06:00 committed by GitHub
commit 9e9d5ad0a9
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tests/unit/modules/test_tls.py
View File

@ -292,6 +292,15 @@ class TLSAddTestCase(TestCase, LoaderModuleMockMixin):
err err
) )
) )
# python-openssl version 0.14, when installed with the "junos-eznc" pip
# package, causes an error on this test. Newer versions of PyOpenSSL do not have
# this issue. If 0.14 is installed and we hit this error, skip the test.
if LooseVersion(OpenSSL.__version__) == LooseVersion('0.14'):
log.exception(err)
self.skipTest(
'Encountered a package conflict. OpenSSL version 0.14 cannot be used with '
'the "junos-eznc" pip package on this test. Skipping.'
)
result = {} result = {}
remove_not_in_result(ret, result) remove_not_in_result(ret, result)