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

Back porting the fix for 2017.7 that ensures the order of the names parameter.

Browse source
This commit is contained in:
Gareth J. Greenaway 2017-07-06 12:12:50 -07:00
parent ea16f47f0a
commit a34970b45b
3 changed files with 17 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
salt/state.py
View file

@ -547,7 +547,7 @@ class Compiler(object):
continue
for state, run in six.iteritems(body):
funcs = set()
names = set()
names = []
if state.startswith('__'):
continue
chunk = {'state': state,
@ -564,7 +564,9 @@ class Compiler(object):
if isinstance(arg, dict):
for key, val in six.iteritems(arg):
if key == 'names':
names.update(val)
for _name in val:
if _name not in names:
names.append(_name)
continue
else:
chunk.update(arg)
@ -1287,7 +1289,7 @@ class State(object):
continue
for state, run in six.iteritems(body):
funcs = set()
names = set()
names = []
if state.startswith('__'):
continue
chunk = {'state': state,
@ -1306,7 +1308,9 @@ class State(object):
if isinstance(arg, dict):
for key, val in six.iteritems(arg):
if key == 'names':
names.update(val)
for _name in val:
if _name not in names:
names.append(_name)
elif key == 'state':
# Don't pass down a state override
continue

12
tests/integration/files/file/base/issue-7649-handle-iorder.sls
View file

@ -1,9 +1,9 @@
handle-iorder:
cmd:
- cwd: /tmp/ruby-1.9.2-p320
- names:
- ./configure
- make
- make install
- run
- cwd: /tmp/ruby-1.9.2-p320
- names:
- ./configure
- make
- make install
- run

7
tests/integration/states/handle_iorder.py
View file

@ -24,11 +24,10 @@ class HandleOrderTest(integration.ModuleCase):
'''
ret = self.run_function('state.show_low_sls', mods='issue-7649-handle-iorder')
sorted_chunks = sorted(ret, key=lambda c: c.get('order'))
sorted_chunks = [chunk['name'] for chunk in sorted(ret, key=lambda c: c.get('order'))]
self.assertEqual(sorted_chunks[0]['name'], './configure')
self.assertEqual(sorted_chunks[1]['name'], 'make')
self.assertEqual(sorted_chunks[2]['name'], 'make install')
expected = ['./configure', 'make', 'make install']
self.assertEqual(expected, sorted_chunks)
if __name__ == '__main__':