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

No more salt.ext.tornado

Browse source
This commit is contained in:
Daniel A. Wozniak 2024-08-28 16:29:58 -07:00
parent 8dd2e3473c
commit 43c825f6ba
1 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -384,7 +384,7 @@ def test_serverside_exception(temp_salt_minion, temp_salt_master):
"""
with MockSaltMinionMaster(temp_salt_minion, temp_salt_master) as minion_master:
with patch.object(minion_master.mock, "_handle_payload_hook") as _mock:
_mock.side_effect = salt.ext.tornado.gen.Return(({}, {"fun": "madeup-fun"}))
_mock.side_effect = tornado.gen.Return(({}, {"fun": "madeup-fun"}))
ret = minion_master.channel.send({}, timeout=5, tries=1)
assert ret == "Server-side exception handling payload"
@ -407,7 +407,7 @@ def test_zeromq_async_pub_channel_publish_port(temp_salt_master):
sign_pub_messages=False,
)
opts["master_uri"] = "tcp://{interface}:{publish_port}".format(**opts)
ioloop = salt.ext.tornado.ioloop.IOLoop()
ioloop = tornado.ioloop.IOLoop()
transport = salt.transport.zeromq.PublishClient(opts, ioloop)
with transport:
patch_socket = MagicMock(return_value=True)
@ -449,7 +449,7 @@ def test_zeromq_async_pub_channel_filtering_decode_message_no_match(
)
opts["master_uri"] = "tcp://{interface}:{publish_port}".format(**opts)
ioloop = salt.ext.tornado.ioloop.IOLoop()
ioloop = tornado.ioloop.IOLoop()
channel = salt.transport.zeromq.PublishClient(opts, ioloop)
with channel:
with patch(
@ -496,7 +496,7 @@ def test_zeromq_async_pub_channel_filtering_decode_message(
)
opts["master_uri"] = "tcp://{interface}:{publish_port}".format(**opts)
ioloop = salt.ext.tornado.ioloop.IOLoop()
ioloop = tornado.ioloop.IOLoop()
channel = salt.transport.zeromq.PublishClient(opts, ioloop)
with channel:
with patch(
@ -511,7 +511,7 @@ def test_zeromq_async_pub_channel_filtering_decode_message(
def test_req_server_chan_encrypt_v2(
pki_dir, encryption_algorithm, signing_algorithm, master_opts
):
loop = salt.ext.tornado.ioloop.IOLoop.current()
loop = tornado.ioloop.IOLoop.current()
master_opts.update(
{
"worker_threads": 1,
@ -560,7 +560,7 @@ def test_req_server_chan_encrypt_v2(
def test_req_server_chan_encrypt_v1(pki_dir, encryption_algorithm, master_opts):
loop = salt.ext.tornado.ioloop.IOLoop.current()
loop = tornado.ioloop.IOLoop.current()
master_opts.update(
{
"worker_threads": 1,
@ -676,7 +676,7 @@ async def test_req_chan_decode_data_dict_entry_v2(minion_opts, master_opts, pki_
print(minion_opts["encryption_algorithm"])
@salt.ext.tornado.gen.coroutine
@tornado.gen.coroutine
def mocksend(msg, timeout=60, tries=3):
client.transport.msg = msg
load = client.auth.crypticle.loads(msg["load"])
@ -689,7 +689,7 @@ async def test_req_chan_decode_data_dict_entry_v2(minion_opts, master_opts, pki_
encryption_algorithm=minion_opts["encryption_algorithm"],
signing_algorithm=minion_opts["signing_algorithm"],
)
raise salt.ext.tornado.gen.Return(ret)
raise tornado.gen.Return(ret)
client.transport.send = mocksend
@ -762,10 +762,10 @@ async def test_req_chan_decode_data_dict_entry_v2_bad_nonce(
signing_algorithm=minion_opts["signing_algorithm"],
)
@salt.ext.tornado.gen.coroutine
@tornado.gen.coroutine
def mocksend(msg, timeout=60, tries=3):
client.transport.msg = msg
raise salt.ext.tornado.gen.Return(ret)
raise tornado.gen.Return(ret)
client.transport.send = mocksend
@ -829,7 +829,7 @@ async def test_req_chan_decode_data_dict_entry_v2_bad_signature(
client.auth.crypticle.loads = auth.crypticle.loads
client.transport = MagicMock()
@salt.ext.tornado.gen.coroutine
@tornado.gen.coroutine
def mocksend(msg, timeout=60, tries=3):
client.transport.msg = msg
load = client.auth.crypticle.loads(msg["load"])
@ -853,7 +853,7 @@ async def test_req_chan_decode_data_dict_entry_v2_bad_signature(
data["pillar"] = {"pillar1": "bar"}
signed_msg["data"] = salt.payload.dumps(data)
ret[dictkey] = pcrypt.dumps(signed_msg)
raise salt.ext.tornado.gen.Return(ret)
raise tornado.gen.Return(ret)
client.transport.send = mocksend
@ -917,7 +917,7 @@ async def test_req_chan_decode_data_dict_entry_v2_bad_key(
client.auth.crypticle.loads = auth.crypticle.loads
client.transport = MagicMock()
@salt.ext.tornado.gen.coroutine
@tornado.gen.coroutine
def mocksend(msg, timeout=60, tries=3):
client.transport.msg = msg
load = client.auth.crypticle.loads(msg["load"])
@ -944,7 +944,7 @@ async def test_req_chan_decode_data_dict_entry_v2_bad_key(
ret[dictkey] = pcrypt.dumps(signed_msg)
key = salt.utils.stringutils.to_bytes(key)
ret["key"] = pub.encrypt(key, minion_opts["encryption_algorithm"])
raise salt.ext.tornado.gen.Return(ret)
raise tornado.gen.Return(ret)
client.transport.send = mocksend