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 4

Salt no longer vendors tornado

Browse source 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
This commit is contained in:
Pedro Algarvio 2023-09-11 10:11:29 +01:00
parent bee29be6dd
commit 2d46e659f4
No known key found for this signature in database
GPG key ID: BB36BF6584A298FF
3 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
salt/transport/zeromq.py
View file

@ -16,6 +16,7 @@ import tornado
import tornado.concurrent
import tornado.gen
import tornado.ioloop
import tornado.locks
import zmq.asyncio
import zmq.error
import zmq.eventloop.zmqstream
@ -638,7 +639,7 @@ class AsyncReqMessageClient:
self._closing = False
self._future = None
self.lock = salt.ext.tornado.locks.Lock()
self.lock = tornado.locks.Lock()
def connect(self):
if hasattr(self, "stream"):

4
tests/pytests/functional/transport/zeromq/test_request_client.py
View file

@ -1,9 +1,9 @@
import pytest
import pytestshellutils.utils.ports
import tornado.gen
import zmq
import zmq.eventloop.zmqstream
import salt.ext.tornado.gen
import salt.transport.zeromq
@ -23,7 +23,7 @@ async def test_request_channel_issue_64627(io_loop, minion_opts, port):
socket.bind(minion_opts["master_uri"])
stream = zmq.eventloop.zmqstream.ZMQStream(socket, io_loop=io_loop)
@salt.ext.tornado.gen.coroutine
@tornado.gen.coroutine
def req_handler(stream, msg):
yield stream.send(msg[0])

7
tests/pytests/unit/transport/test_zeromq.py
View file

@ -3,6 +3,7 @@ import multiprocessing
import msgpack
import pytest
import tornado.concurrent
import salt.config
import salt.transport.zeromq
@ -81,15 +82,15 @@ async def test_client_timeout_msg(minion_opts):
)
assert hasattr(client, "_future")
assert client._future is None
future = salt.ext.tornado.concurrent.Future()
future = tornado.concurrent.Future()
client._future = future
client.timeout_message(future)
with pytest.raises(salt.exceptions.SaltReqTimeoutError):
await future
assert client._future is None
future_a = salt.ext.tornado.concurrent.Future()
future_b = salt.ext.tornado.concurrent.Future()
future_a = tornado.concurrent.Future()
future_b = tornado.concurrent.Future()
future_b.set_exception = MagicMock()
client._future = future_a
client.timeout_message(future_b)