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 `unit.modules.test_win_status` #48104

Merged
merged 1 commit into from Jun 15, 2018

Conversation

Projects
None yet
3 participants
@twangboy
Contributor

twangboy commented Jun 13, 2018

What does this PR do?

Fixes an issue with the test for win_status.

What issues does this PR fix or reference?

Jenkins

Previous Behavior

In the transition to unicode, some of the log messages changed from the '{0}'.format('something') format to 'this %s', 'something' format. In the test it was checking that the log.warning was called with a single item which works with the .format method. The new method considers each element and item, so the test would fail.

New Behavior

Add's an additional ANY to the assertion in the test. Also adds the self.expected_error_code to the first test which removes the need for the second assertion (assertIn)

Tests written?

Yes

Commits signed with GPG?

Yes

@salt-jenkins salt-jenkins requested a review from saltstack/team-windows Jun 13, 2018

@rallytime

This comment has been minimized.

Contributor

rallytime commented Jun 14, 2018

re-run py

@cachedout

Seems reasonable.

@rallytime rallytime merged commit 152c09c into saltstack:2018.3 Jun 15, 2018

6 of 9 checks passed

jenkins/PR/salt-pr-linode-cent7-py3 Pull Requests » Salt PR - Linode CentOS 7 - PY3 #5733 — ABORTED
Details
default Build finished.
Details
jenkins/PR/salt-pr-rs-cent7-n Pull Requests » Salt PR - RS CentOS 7 #19787 — FAILURE
Details
WIP ready for review
Details
jenkins/PR/salt-pr-clone Pull Requests » Salt PR - Clone #25936 — SUCCESS
Details
jenkins/PR/salt-pr-docs-n Pull Requests » Salt PR - Docs #17978 — SUCCESS
Details
jenkins/PR/salt-pr-linode-ubuntu14-n Pull Requests » Salt PR - Linode Ubuntu14.04 #23663 — SUCCESS
Details
jenkins/PR/salt-pr-linode-ubuntu16-py3 Pull Requests » Salt PR - Linode Ubuntu16.04 - PY3 #10704 — SUCCESS
Details
jenkins/PR/salt-pr-lint-n Pull Requests » Salt PR - Code Lint #22609 — SUCCESS
Details

@twangboy twangboy deleted the twangboy:fix_test_win_status branch Jun 18, 2018

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