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

Py3 compatibility fixes

Browse source
This commit is contained in:
Pedro Algarvio 2014-11-21 20:27:56 +00:00
parent 2d8b216bcd
commit a4e48e8873
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
tests/integration/modules/state.py
View file

@ -15,6 +15,9 @@ import integration
import salt.utils
from salt.modules.virtualenv_mod import KNOWN_BINARY_NAMES
# Import 3rd-party libs
import salt.ext.six as six
class StateModuleTest(integration.ModuleCase,
integration.SaltReturnAssertsMixIn):
@ -486,7 +489,7 @@ fi
Normalize the return to the format that we'll use for result checking
'''
result = {}
for item, descr in ret.iteritems():
for item, descr in six.iteritems(ret):
result[item] = {
'__run_num__': descr['__run_num__'],
'comment': descr['comment'],
@ -805,7 +808,7 @@ fi
# TODO issue #8235 & #8774 some examples are still commented in the test file
ret = self.run_function('state.sls', mods='requisites.use')
self.assertReturnNonEmptySaltType(ret)
for item, descr in ret.iteritems():
for item, descr in six.iteritems(ret):
self.assertEqual(descr['comment'], 'onlyif execution failed')
# TODO: issue #8802 : use recursions undetected