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

Fix salt.modules.publish and salt.states.x509 tests #52645

Merged
merged 2 commits into from Apr 20, 2019

Conversation

@dwoz
Copy link
Contributor

commented Apr 20, 2019

The peers.conf addition for the x509 state tests broke the
salt.modules.publish tests. Move the configuration to the test master's
config. Also increase the publish call timeout in the x509 module to
make the x509 state tests reliable on all platforms.

This PR fixes the following tests:

integration.modules.test_publish.PublishModuleTest.test_full_data
integration.modules.test_publish.PublishModuleTest.test_publish
integration.modules.test_publish.PublishModuleTest.test_publish_yaml_args
integration.modules.test_publish.PublishModuleTest.test_kwarg

And makes the following tests more reliable:

tests.integration.states.test_x509.x509Test.test_cert_signing

Fixes: #52508

Tests written?

No - Fixing tests

Commits signed with GPG?

Yes

The peers.conf addition for the x509 state tests broke the
salt.modules.publish tests. Move the configuration to the test master's
config. Also increase the publish call timeout in the x509 module to
make the x509 state tests reliable on all platforms.
@s0undt3ch s0undt3ch merged commit af4f204 into saltstack:2019.2.1 Apr 20, 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.