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 19:41:22 +00:00
parent 60f215f191
commit 5bc0c157b6
1 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
tests/integration/__init__.py
View file

@ -23,12 +23,13 @@ import subprocess
import multiprocessing
from hashlib import md5
from datetime import datetime, timedelta
from six import string_types
try:
import pwd
except ImportError:
pass
# Import 3rd-party libs
import salt.ext.six as six
STATE_FUNCTION_RUNNING_RE = re.compile(
r'''The function (?:"|')(?P<state_func>.*)(?:"|') is running as PID '''
@ -810,7 +811,7 @@ class TestDaemon(object):
list(targets), 'saltutil.running', expr_form='list'
)
return [
k for (k, v) in running.iteritems() if v and v[0]['jid'] == jid
k for (k, v) in six.iteritems(running) if v and v[0]['jid'] == jid
]
def wait_for_minion_connections(self, targets, timeout):
@ -914,13 +915,13 @@ class TestDaemon(object):
while syncing:
rdata = self.client.get_full_returns(jid_info['jid'], syncing, 1)
if rdata:
for name, output in rdata.iteritems():
for name, output in six.iteritems(rdata):
if not output['ret']:
# Already synced!?
syncing.remove(name)
continue
if isinstance(output['ret'], string_types):
if isinstance(output['ret'], six.string_types):
# An errors has occurred
print(
' {LIGHT_RED}*{ENDC} {0} Failed to sync {2}: '
@ -1101,7 +1102,7 @@ class ModuleCase(TestCase, SaltClientTestCaseMixIn):
jids = []
# These are usually errors
for item in ret[:]:
if not isinstance(item, string_types):
if not isinstance(item, six.string_types):
# We don't know how to handle this
continue
match = STATE_FUNCTION_RUNNING_RE.match(item)
@ -1332,8 +1333,8 @@ class SaltReturnAssertsMixIn(object):
if isinstance(keys, tuple):
# If it's a tuple, turn it into a list
keys = list(keys)
elif isinstance(keys, basestring):
# If it's a basestring , make it a one item list
elif isinstance(keys, six.string_types):
# If it's a string, make it a one item list
keys = [keys]
elif not isinstance(keys, list):
# If we've reached here, it's a bad type passed to keys
@ -1344,7 +1345,7 @@ class SaltReturnAssertsMixIn(object):
self.assertReturnNonEmptySaltType(ret)
keys = self.__return_valid_keys(keys)
okeys = keys[:]
for part in ret.itervalues():
for part in six.itervalues(ret):
try:
ret_item = part[okeys.pop(0)]
except (KeyError, TypeError):
@ -1372,7 +1373,7 @@ class SaltReturnAssertsMixIn(object):
try:
raise AssertionError(
'{result} is not True. Salt Comment:\n{comment}'.format(
**(ret.values()[0])
**(six.itervalues(ret)[0])
)
)
except (AttributeError, IndexError):
@ -1390,7 +1391,7 @@ class SaltReturnAssertsMixIn(object):
try:
raise AssertionError(
'{result} is not False. Salt Comment:\n{comment}'.format(
**(ret.values()[0])
**(six.itervalues(ret)[0])
)
)
except (AttributeError, IndexError):
@ -1406,7 +1407,7 @@ class SaltReturnAssertsMixIn(object):
try:
raise AssertionError(
'{result} is not None. Salt Comment:\n{comment}'.format(
**(ret.values()[0])
**(six.itervalues(ret)[0])
)
)
except (AttributeError, IndexError):