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

conform shell integration tests to txt runner

Browse Source
This commit is contained in:
Justin Findlay 2015-02-17 15:20:43 -07:00
parent f202aaf072
commit 0d6663b8a8
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -215,23 +215,23 @@ class MatchTest(integration.ShellCase, integration.ShellCaseCommonTestsMixIn):
'''
Test to see if we're supporting --doc
'''
data = self.run_salt(r'-d \* user')
self.assertIn('user.add:', data)
data = self.run_salt('-d "*" user')
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)
data = self.run_salt('\'*\' -d -t 20')
self.assertIn('user.add:', data)
data = self.run_salt('\'*\' -d user -t 20')
self.assertIn('user.add:', data)
data = self.run_salt('\'*\' sys.doc -d user -t 20')
self.assertIn('user.add:', data)
data = self.run_salt('\'*\' sys.doc user -t 20')
self.assertIn('user.add:', data)
self.assertIn("'user.add:'", data)
data = self.run_salt('"*" -d -t 20')
self.assertIn("'user.add:'", data)
data = self.run_salt('"*" -d user -t 20')
self.assertIn("'user.add:'", data)
data = self.run_salt('"*" sys.doc -d user -t 20')
self.assertIn("'user.add:'", data)
data = self.run_salt('"*" sys.doc user -t 20')
self.assertIn("'user.add:'", data)
def test_salt_documentation_too_many_arguments(self):
'''

2
tests/integration/shell/runner.py
View File

@ -80,7 +80,7 @@ class RunTest(integration.ShellCase, integration.ShellCaseCommonTestsMixIn):
with_retcode=True
)
try:
self.assertIn('doc.runner:', ret[0])
self.assertIn("'doc.runner:'", ret[0])
self.assertFalse(os.path.isdir(os.path.join(config_dir, 'file:')))
except AssertionError:
if os.path.exists('/dev/log') and ret[2] != 2: