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

Skip tsl unit test when we hit an error due to OpenSSL and junos-eznc packaging conflict

Browse Source 
he pip junos-eznc package, when installed with PyOpenSSL version 0.14 causes
this test failure. If you either remove junos-eznc, or upgrade PyOpenSSL
(current is 0.17) the test is happy. So, we need to handle this case in the test.
This commit is contained in:
rallytime 2017-04-20 17:02:33 -06:00
parent 4914486067
commit d5b1241972
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
)
)
# 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 = {}
remove_not_in_result(ret, result)