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

fix tests

Browse source
This commit is contained in:
Thomas S Hatch 2015-04-15 11:59:25 -06:00
parent 0bf800e2ff
commit b626149245
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
salt/cli/cp.py
View file

@ -104,4 +104,5 @@ class SaltCP(object):
salt.output.display_output(
ret,
self.opts.get('output', 'nested'),
self.opts)

4
tests/integration/shell/cp.py
View file

@ -76,7 +76,7 @@ class CopyTest(integration.ShellCase, integration.ShellCaseCommonTestsMixIn):
integration.TMP, 'cp_{0}_testfile'.format(idx)
)
ret = self.run_cp('{0} {1} {2}'.format(
ret = self.run_cp('--out pprint {0} {1} {2}'.format(
pipes.quote(minion),
pipes.quote(testfile),
pipes.quote(minion_testfile)
@ -138,7 +138,7 @@ class CopyTest(integration.ShellCase, integration.ShellCaseCommonTestsMixIn):
ret = self.run_script(
self._call_binary_,
'--config-dir {0} \'*\' foo {0}/foo'.format(
'--out pprint --config-dir {0} \'*\' foo {0}/foo'.format(
config_dir
),
catch_stderr=True,