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

Merge branch 'retcode_failure_test' of https://github.com/cro/salt into cro-retcode_failure_test

Browse Source
This commit is contained in:
Thomas S Hatch 2014-10-15 16:56:12 -06:00
commit 906719d691
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/integration/files/file/base/saltcalllocal.sls Normal file
View File

@ -0,0 +1,4 @@
regular-module:
module.run:
- name: test.echo
- text: hello

8
tests/integration/shell/call.py
View File

@ -48,6 +48,14 @@ class CallTest(integration.ShellCase, integration.ShellCaseCommonTestsMixIn):
self.assertEqual(''.join(expect), ''.join(out).rsplit(",", 1)[0])
def test_local_sls_call(self):
fileroot = os.path.join(integration.FILES,'file','base')
out = self.run_call('--file-root {0} --local state.sls saltcalllocal'.format(fileroot))
self.assertIn('Name: test.echo', ''.join(out))
self.assertIn('Result: True', ''.join(out))
self.assertIn('hello', ''.join(out))
self.assertIn('Succeeded: 1', ''.join(out))
@skipIf(sys.platform.startswith('win'), 'This test does not apply on Win')
def test_user_delete_kw_output(self):
ret = self.run_call('-l quiet -d user.delete')