valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-06 16:45:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Make sure test_grain passes with raet

Browse Source
This commit is contained in:
Aditya Kulkarni 2014-07-15 15:43:46 -04:00
parent 739ae438eb
commit 978ae5fb51
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tests/integration/shell/matcher.py
View File

@ -108,10 +108,18 @@ class MatchTest(integration.ShellCase, integration.ShellCaseCommonTestsMixIn):
self.assertIn('sub_minion', data)
self.assertNotIn('minion', data.replace('sub_minion', 'stub'))
data = self.run_salt('-G "planets:pluto" test.ping')
expect = None
if self.master_opts['transport'] == 'zeromq':
expect = (
'No minions matched the target. '
'No command was sent, no jid was '
'assigned.'
)
elif self.master_opts['transport'] == 'raet':
expect = ''
self.assertEqual(
''.join(data),
'No minions matched the target. No command was sent, no jid was '
'assigned.'
expect
)
# Nested grain (string value)
data = self.run_salt('-t 1 -G "level1:level2:foo" test.ping')