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

Fix stack trace on Jenkins

Browse source
This commit is contained in:
twangboy 2016-07-19 10:04:24 -07:00
parent b1014cdefb
commit c5245f6b24
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
tests/integration/__init__.py
View file

@ -30,11 +30,6 @@ try:
except ImportError:
pass
try:
import salt.ext.six.moves.socketserver as socketserver
except ImportError:
import socketserver
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]+)'
@ -81,7 +76,11 @@ except ImportError:
import yaml
import msgpack
import salt.ext.six as six
import salt.ext.six.moves.socketserver as socketserver # pylint: disable=no-name-in-module
try:
import salt.ext.six.moves.socketserver as socketserver # pylint: disable=name-in-module
except ImportError:
import socketserver
if salt.utils.is_windows():
import win32api