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

Import six at a later stage

Browse source
This commit is contained in:
Pedro Algarvio 2014-11-22 10:12:06 +00:00
parent cca8da793b
commit 3f24dcfa80
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
tests/integration/__init__.py
View file

@ -28,9 +28,6 @@ try:
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 '''
r'(?P<pid>[\d]+) and was started at (?P<date>.*) with jid (?P<jid>[\d]+)'
@ -68,11 +65,12 @@ from salt.utils.immutabletypes import freeze
try:
import salt.master
except ImportError:
# Not required fro raet tests
# Not required for raet tests
pass
# Import 3rd-party libs
import yaml
import salt.ext.six as six
if os.uname()[0] == 'Darwin':
SYS_TMP_DIR = '/tmp'