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

tweaking

Browse source
This commit is contained in:
Gareth J. Greenaway 2017-10-31 08:57:38 -07:00
parent d2bfa95018
commit d9dcb84fe3
No known key found for this signature in database
GPG key ID: 10B62F8A7CAD7A41
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
salt/state.py
View file

@ -2236,7 +2236,7 @@ class State(object):
fun_stats = set()
for r_state, chunks in six.iteritems(reqs):
req_stats = set()
if r_state.startswith(u'prereq'):
if r_state == u'prereq':
run_dict = self.pre
else:
run_dict = running

1
tests/integration/modules/test_state.py
View file

@ -844,6 +844,7 @@ class StateModuleTest(ModuleCase, SaltReturnAssertsMixin):
result = self.normalize_ret(ret)
self.assertEqual(expected_result_simple, result)
log.error('=== ret {} ==='.format(ret))
return
# same test, but not using lists in yaml syntax
# TODO: issue #8235, prereq ignored when not used in list syntax