valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #5 from jfindlay/merge

Browse Source 
fix matcher tests for 2015.2->develop merge
This commit is contained in:
Colton Myers 2015-02-23 15:43:53 -07:00
commit beaf9ef637
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -217,22 +217,22 @@ class MatchTest(integration.ShellCase, integration.ShellCaseCommonTestsMixIn):
Test to see if we're supporting --doc
'''
data = self.run_salt('-d "*" user')
self.assertIn("'user.add:'", data)
self.assertIn('user.add:', data)
def test_salt_documentation_arguments_not_assumed(self):
'''
Test to see if we're not auto-adding '*' and 'sys.doc' to the call
'''
data = self.run_salt('-d -t 20')
self.assertIn("'user.add:'", data)
self.assertIn('user.add:', data)
data = self.run_salt('"*" -d -t 20')
self.assertIn("'user.add:'", data)
self.assertIn('user.add:', data)
data = self.run_salt('"*" -d user -t 20')
self.assertIn("'user.add:'", data)
self.assertIn('user.add:', data)
data = self.run_salt('"*" sys.doc -d user -t 20')
self.assertIn("'user.add:'", data)
self.assertIn('user.add:', data)
data = self.run_salt('"*" sys.doc user -t 20')
self.assertIn("'user.add:'", data)
self.assertIn('user.add:', data)
def test_salt_documentation_too_many_arguments(self):
'''