saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Ensure tests pass on raet and zmq

Browse source
This commit is contained in:
Aditya Kulkarni 2014-07-17 10:32:07 -04:00
parent 62d64daf1c
commit 88a873a171
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
tests/integration/shell/matcher.py
View file

@ -4,6 +4,7 @@
import os
import yaml
import shutil
import time
# Import Salt Testing libs
from salttesting.helpers import ensure_in_syspath
@ -40,19 +41,23 @@ class MatchTest(integration.ShellCase, integration.ShellCaseCommonTestsMixIn):
data = '\n'.join(data)
self.assertIn('minion', data)
self.assertNotIn('sub_minion', data)
time.sleep(2)
data = self.run_salt('-C "min* and not G@test_grain:foo" test.ping')
data = '\n'.join(data)
self.assertIn('minion', data)
self.assertNotIn('sub_minion', data)
time.sleep(2)
data = self.run_salt('-C "min* not G@test_grain:foo" test.ping')
data = '\n'.join(data)
self.assertIn('minion', data)
self.assertNotIn('sub_minion', data)
time.sleep(2)
match = 'P@test_grain:^cheese$ and * and G@test_grain:cheese'
data = self.run_salt('-t 1 -C \'{0}\' test.ping'.format(match))
data = '\n'.join(data)
self.assertIn('minion', data)
self.assertNotIn('sub_minion', data)
time.sleep(2)
match = 'L@sub_minion and E@.*'
data = self.run_salt('-t 1 -C "{0}" test.ping'.format(match))
data = '\n'.join(data)