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

Fix test case skipping logic: if < py2.7 then no OrderedDict, so skip.

Browse Source 
For ordered execution, PyDSL requires py2.7 or above. Although, it's
possible to make it work with a third-party OrderedDict implementation
like the yaml renderer does..., this is not bothered here.
This commit is contained in:
Jack Kuan 2013-01-24 12:21:54 -05:00
parent 01cd56c80f
commit 0976f42410
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tests/unit/pydsl_test.py
View File

@ -9,7 +9,6 @@ from saltunittest import TestCase
import salt.loader
import salt.config
from salt.state import State, HighState
from salt.renderers.yaml import HAS_ORDERED_DICT
REQUISITES = ['require', 'require_in', 'use', 'use_in', 'watch', 'watch_in']
@ -208,7 +207,7 @@ state('A').cmd.run(name='echo hello world')
def test_ordered_states(self):
if sys.version_info < (2, 7) and not HAS_ORDERED_DICT:
if sys.version_info < (2, 7):
self.skipTest('OrderedDict is not available')
result = render_sls('''
__pydsl__.set(ordered=True)
@ -226,7 +225,7 @@ state('B').file.managed(source='/a/b/c')
def test_pipe_through_stateconf(self):
if sys.version_info < (2, 7) and not HAS_ORDERED_DICT:
if sys.version_info < (2, 7):
self.skipTest('OrderedDict is not available')
dirpath = tempfile.mkdtemp()
output = os.path.join(dirpath, 'output')