valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #3334 from s0undt3ch/develop

Browse Source 
Fix `tests.unit.pydsl_test` and `tests.unit.stateconf_test`.
This commit is contained in:
Thomas S Hatch 2013-01-19 20:12:23 -08:00
commit d9b1997c30
2 changed files with 7 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tests/unit/pydsl_test.py
View File

@ -13,10 +13,7 @@ from salt.renderers.yaml import HAS_ORDERED_DICT
REQUISITES = ['require', 'require_in', 'use', 'use_in', 'watch', 'watch_in']
OPTS = salt.config.master_config('whatever, just load the defaults!')
# we should have used minion_config(), but that would try to resolve
# the master hostname, and retry for 30 seconds! Lucily for our purpose,
# master conf or minion conf, it doesn't matter.
OPTS = salt.config.minion_config(None, check_dns=False)
OPTS['id'] = 'whatever'
OPTS['file_client'] = 'local'
OPTS['file_roots'] = dict(base=['/tmp'])
@ -30,8 +27,6 @@ def render_sls(content, sls='', env='base', **kws):
StringIO(content), env=env, sls=sls,
**kws)
class PyDSLRendererTestCase(TestCase):
def setUp(self):

6
tests/unit/stateconf_test.py
View File

@ -10,11 +10,7 @@ import salt.config
REQUISITES = ['require', 'require_in', 'use', 'use_in', 'watch', 'watch_in']
OPTS = salt.config.master_config('whatever, just load the defaults!')
# we should have used minion_config(), but that would try to resolve
# the master hostname, and retry for 30 seconds! Lucily for our purpose,
# master conf or minion conf, it doesn't matter.
OPTS = salt.config.minion_config(None, check_dns=False)
OPTS['file_client'] = 'local'
OPTS['file_roots'] = dict(base=['/'])