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

Prevent ssh_auth.absent from running when test=True #29264

Merged
merged 2 commits into from Nov 30, 2015

Conversation

Projects
None yet
3 participants
@anlutro
Contributor

anlutro commented Nov 30, 2015

fixes #29262

@anlutro

This comment has been minimized.

Show comment
Hide comment
@anlutro

anlutro Nov 30, 2015

Contributor

Anything I should do with the test that's failing? It seems unrelated.

Contributor

anlutro commented Nov 30, 2015

Anything I should do with the test that's failing? It seems unrelated.

@cachedout

This comment has been minimized.

Show comment
Hide comment
@cachedout

cachedout Nov 30, 2015

Contributor

@anlutro It looks as though it might be related.

@jfindlay Could you jump in and have a look here please? Perhaps you can help out.

Contributor

cachedout commented Nov 30, 2015

@anlutro It looks as though it might be related.

@jfindlay Could you jump in and have a look here please? Perhaps you can help out.

@anlutro

This comment has been minimized.

Show comment
Hide comment
@anlutro

anlutro Nov 30, 2015

Contributor

I see why it's failing - the source arg needs to be checked before the if __opts__['test'].

Contributor

anlutro commented Nov 30, 2015

I see why it's failing - the source arg needs to be checked before the if __opts__['test'].

@anlutro

This comment has been minimized.

Show comment
Hide comment
@anlutro

anlutro Nov 30, 2015

Contributor

Nevermind, the mocks in the tests were flawed - set up to return values they shouldn't return.

Contributor

anlutro commented Nov 30, 2015

Nevermind, the mocks in the tests were flawed - set up to return values they shouldn't return.

fix ssh_auth_test
there were 4 side_effect return values, when it should only return 2
times - 2 of the 4 states.ssh_auth.absent calls are done with test=True
test=True and should therefore not call modules.ssh.rm_auth_key
@cachedout

This comment has been minimized.

Show comment
Hide comment
@cachedout

cachedout Nov 30, 2015

Contributor

@anlutro OK. Could you modify the tests and include them in this PR?

Contributor

cachedout commented Nov 30, 2015

@anlutro OK. Could you modify the tests and include them in this PR?

@anlutro

This comment has been minimized.

Show comment
Hide comment
@anlutro

anlutro Nov 30, 2015

Contributor

@jfindlay done - hopefully the commit message explains what was wrong well

Contributor

anlutro commented Nov 30, 2015

@jfindlay done - hopefully the commit message explains what was wrong well

@anlutro

This comment has been minimized.

Show comment
Hide comment
@anlutro

anlutro Nov 30, 2015

Contributor

Er, that mention above was for @cachedout - oops.

Contributor

anlutro commented Nov 30, 2015

Er, that mention above was for @cachedout - oops.

cachedout added a commit that referenced this pull request Nov 30, 2015

Merge pull request #29264 from alprs/fix-ssh_auth_absent_test
Prevent ssh_auth.absent from running when test=True

@cachedout cachedout merged commit 8d32d8d into saltstack:2015.8 Nov 30, 2015

3 of 6 checks passed

jenkins/salt-pr-rs-cent6-n Salt PR - RS CentOS 6 #280 — FAILURE
Details
jenkins/salt-pr-rs-cent7-n Salt PR - RS CentOS 7 #10105 — FAILURE
Details
default Merged build started.
Details
jenkins/salt-pr-clone Salt PR - Clone Repository #11570 — SUCCESS
Details
jenkins/salt-pr-linode-ubuntu14.04-n Salt PR - Linode Ubuntu 14.04 #2637 — SUCCESS
Details
jenkins/salt-pr-lint-n Salt PR - Code Lint #11278 — SUCCESS
Details
@cachedout

This comment has been minimized.

Show comment
Hide comment
@cachedout

cachedout Nov 30, 2015

Contributor

Looks good. Thanks, @anlutro

Contributor

cachedout commented Nov 30, 2015

Looks good. Thanks, @anlutro

@anlutro anlutro deleted the alprs:fix-ssh_auth_absent_test branch Mar 23, 2016

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment