mirror of
https://github.com/saltstack/salt.git
synced 2025-04-17 10:10:20 +00:00
full sls require test, and yet to do check for require_in or prereq #8233
This commit is contained in:
parent
7b01991c0a
commit
ab4ee0ba1f
5 changed files with 64 additions and 0 deletions
|
@ -0,0 +1,7 @@
|
|||
include:
|
||||
- requisites.fullsls_test
|
||||
A:
|
||||
cmd.run:
|
||||
- name: echo A
|
||||
- prereq:
|
||||
- sls: requisites.fullsls_test
|
|
@ -0,0 +1,7 @@
|
|||
include:
|
||||
- requisites.fullsls_test
|
||||
A:
|
||||
cmd.run:
|
||||
- name: echo A
|
||||
- require:
|
||||
- sls: requisites.fullsls_test
|
|
@ -0,0 +1,7 @@
|
|||
include:
|
||||
- requisites.fullsls_test
|
||||
A:
|
||||
cmd.run:
|
||||
- name: echo A
|
||||
- require_in:
|
||||
- sls: requisites.fullsls_test
|
|
@ -0,0 +1,6 @@
|
|||
B:
|
||||
cmd.run:
|
||||
- name: echo B
|
||||
C:
|
||||
cmd.run:
|
||||
- name: echo C
|
|
@ -432,6 +432,43 @@ fi
|
|||
['A recursive requisite was found, SLS "requisites.require_recursion_error1" ID "B" ID "A"']
|
||||
)
|
||||
|
||||
def test_requisites_full_sls(self):
|
||||
'''
|
||||
Teste the sls special command in requisites
|
||||
'''
|
||||
expected_result={
|
||||
'cmd_|-A_|-echo A_|-run': {
|
||||
'__run_num__': 2,
|
||||
'comment': 'Command "echo A" run',
|
||||
'result': True},
|
||||
'cmd_|-B_|-echo B_|-run': {
|
||||
'__run_num__': 0,
|
||||
'comment': 'Command "echo B" run',
|
||||
'result': True},
|
||||
'cmd_|-C_|-echo C_|-run': {
|
||||
'__run_num__': 1,
|
||||
'comment': 'Command "echo C" run',
|
||||
'result': True},
|
||||
}
|
||||
result={}
|
||||
ret = self.run_function('state.sls', mods='requisites.fullsls_require')
|
||||
for item,descr in ret.iteritems():
|
||||
result[item] = {
|
||||
'__run_num__': descr['__run_num__'],
|
||||
'comment':descr['comment'],
|
||||
'result':descr['result']
|
||||
}
|
||||
self.assertEqual(expected_result, result)
|
||||
|
||||
# TODO: not done
|
||||
#ret = self.run_function('state.sls', mods='requisites.fullsls_require_in')
|
||||
#self.assertEqual(['sls command can only be used with require requisite'], ret)
|
||||
|
||||
# issue #8233: traceback on prereq sls
|
||||
# TODO: not done
|
||||
#ret = self.run_function('state.sls', mods='requisites.fullsls_prereq')
|
||||
#self.assertEqual(['sls command can only be used with require requisite'], ret)
|
||||
|
||||
def test_requisites_prereq_simple_ordering_and_errors(self):
|
||||
'''
|
||||
Call sls file containing several prereq_in and prereq.
|
||||
|
|
Loading…
Add table
Reference in a new issue