Test custom grains matcher #34324
Merged
Test custom grains matcher #34324
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
added 2 commits
June 27, 2016 17:01
| @@ -159,6 +161,11 @@ def test_grain(self): | |||
| data = '\n'.join(data) | |||
| self.assertIn('sub_minion', data) | |||
| self.assertNotIn('minion', data.replace('sub_minion', 'stub')) | |||
| # Custom grain | |||
| data = self.run_salt('-t 1 -G "match:maker" test.ping') | |||
There was a problem hiding this comment.
Where does the {'match': 'maker'} grain come from? I think that is why this test is failing. There isn't a return from the minions on this custom grain call. The first assertIn is passing because 'minion' is found in ['No minions matched the target. No command was sent, no jid was assigned.'].
You could maybe use the custom grains files in integration/files/file/base/_grains/* for this test instead.
There was a problem hiding this comment.
Oh I think I forgot to git add it. Derp.
There was a problem hiding this comment.
Ah, that would make more sense!
rallytime
added
the
pending-changes
rallytime
removed
the
pending-changes
rallytime
added
the
bugfix-bckport
gitebra
pushed a commit
to gitebra/salt
that referenced
this pull request
Jun 28, 2016
* upstream/develop: Test custom grains matcher (saltstack#34324)
rallytime
added
ZZZ[Done]-back-ported-bf
rallytime
pushed a commit
that referenced
this pull request
Jun 28, 2016
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.
No description provided.