From 2d46e659f486a1fe599d6530070a87560c022469 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Mon, 11 Sep 2023 10:11:29 +0100 Subject: [PATCH] Salt no longer vendors `tornado` Signed-off-by: Pedro Algarvio --- salt/transport/zeromq.py | 3 ++- .../functional/transport/zeromq/test_request_client.py | 4 ++-- tests/pytests/unit/transport/test_zeromq.py | 7 ++++--- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/salt/transport/zeromq.py b/salt/transport/zeromq.py index d0e9509e72e..59afd2c27cf 100644 --- a/salt/transport/zeromq.py +++ b/salt/transport/zeromq.py @@ -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"): diff --git a/tests/pytests/functional/transport/zeromq/test_request_client.py b/tests/pytests/functional/transport/zeromq/test_request_client.py index 7ab2295baaf..7e311f61e54 100644 --- a/tests/pytests/functional/transport/zeromq/test_request_client.py +++ b/tests/pytests/functional/transport/zeromq/test_request_client.py @@ -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]) diff --git a/tests/pytests/unit/transport/test_zeromq.py b/tests/pytests/unit/transport/test_zeromq.py index d26239e6ec9..6d43d19b36b 100644 --- a/tests/pytests/unit/transport/test_zeromq.py +++ b/tests/pytests/unit/transport/test_zeromq.py @@ -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)