Use self.run_run instead of self.run_run_plus

Using a salt.runner.Runner() instance to run this test has exposed a
problem with run_run_plus, where the fileclient doesn't behave as
expected. Since the raw return data is not needed, using run_run here
lets the test pass while we continue to work on run_run_plus.
This commit is contained in:
Erik Johnson 2016-09-02 00:04:18 -05:00
parent e36d6839d1
commit 9ae753f6ed

View File

@ -41,14 +41,14 @@ class StateRunnerTest(integration.ShellCase):
Also test against some sample "good" output that would be included in a correct
orchestrate run.
'''
ret = self.run_run_plus('state.orchestrate', 'orch.simple')
#ret_output = self.run_run_plus('state.orchestrate', 'orch.simple')['out']
ret_output = self.run_run('state.orchestrate orch.simple')
bad_out = ['outputter:', ' highstate']
good_out = [' Function: salt.state',
' Result: True',
'Succeeded: 1 (changed=1)',
'Failed: 0',
'Total states run: 1']
ret_output = ret.get('out')
# First, check that we don't have the "bad" output that was displaying in
# Issue #31330 where only the highstate outputter was listed