Fix unit.states.test_reg test failure
#47985
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ghost
self-requested a review
skizunov
reviewed
Jun 5, 2018
tests/unit/states/test_reg.py
Outdated
| @@ -48,8 +49,12 @@ def test_present(self): | |||
| {'vdata': 'a', 'success': True}, | |||
| {'vdata': 'a', 'success': True}]) | |||
| mock_t = MagicMock(return_value=True) | |||
| mock_cast = MagicMock( | |||
| return_value=salt.utils.stringutils.to_unicode(vdata) | |||
| ) | |||
There was a problem hiding this comment.
Could this simply be:
mock_cast = MagicMock(return_value=vdata)
Because vdata is already unicode (on PY2) due to from __future__ import unicode_literals?
Or am I missing something that requires the explicit cast?
There was a problem hiding this comment.
No, it's my own idiocy. I saw that that's what cast_vdata was returning, so I thought I should make the mock the same. The tests pass without the to_unicode. I'll remove it.
twangboy
requested review from
aaronfrost,
a team and
skizunov
and removed request for
aaronfrost
skizunov
approved these changes
Jun 6, 2018
gtmanfred
approved these changes
Jun 6, 2018
gtmanfred
approved these changes
Jun 6, 2018
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What does this PR do?
Fixes failing test by mocking
reg.cast_vdataWhat issues does this PR fix or reference?
Found by Jenkins
Tests written?
Yes
Commits signed with GPG?
Yes