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

Use ZMQ switch utility in the integration tests

Browse source
This commit is contained in:
Bo Maryniuk 2018-02-15 14:04:45 +01:00
parent ab5fa34d7c
commit 296c589f4b
1 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
tests/integration/netapi/rest_tornado/test_app.py
View file

@ -18,13 +18,9 @@ from tests.support.helpers import flaky
from tests.support.unit import skipIf
# Import 3rd-party libs
import salt.ext.six as six
try:
import zmq
from zmq.eventloop.ioloop import ZMQIOLoop
HAS_ZMQ_IOLOOP = True
except ImportError:
HAS_ZMQ_IOLOOP = False
from salt.ext import six
from salt.utils.zeromq import zmq, ZMQDefaultLoop as ZMQIOLoop
HAS_ZMQ_IOLOOP = bool(zmq)
def json_loads(data):