saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-16 09:40:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Update changelog entry

Browse source
This commit is contained in:
Daniel A. Wozniak 2023-05-31 00:51:48 -07:00 • committed by Gareth J. Greenaway
parent e8c016419b
commit d50ba4de9b
3 changed files with 3 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
changelog/64305.fixed.md
View file

@ -1 +1 @@
Upgade to a recent tornado version 6.1
Upgade tornado to 6.3.2

3
tests/pytests/integration/netapi/rest_cherrypy/conftest.py
View file

@ -34,8 +34,9 @@ def client_headers(auth_token, content_type_map):
}
# The order of these fixutres matters, app must come before io_loop.
@pytest.fixture
def http_server(io_loop, app, netapi_port, client_headers):
def http_server(app, netapi_port, client_headers, io_loop):
with netapi.TestsTornadoHttpServer(
io_loop=io_loop, app=app, port=netapi_port, client_headers=client_headers
) as server:

10
tests/pytests/unit/test_minion.py
View file

@ -478,7 +478,6 @@ def test_beacons_before_connect(minion_opts):
):
minion_opts["beacons_before_connect"] = True
io_loop = tornado.ioloop.IOLoop()
io_loop.make_current()
minion = salt.minion.Minion(minion_opts, io_loop=io_loop)
try:
@ -511,7 +510,6 @@ def test_scheduler_before_connect(minion_opts):
):
minion_opts["scheduler_before_connect"] = True
io_loop = tornado.ioloop.IOLoop()
io_loop.make_current()
minion = salt.minion.Minion(minion_opts, io_loop=io_loop)
try:
try:
@ -600,7 +598,6 @@ def test_when_ping_interval_is_set_the_callback_should_be_added_to_periodic_call
):
minion_opts["ping_interval"] = 10
io_loop = tornado.ioloop.IOLoop()
io_loop.make_current()
minion = salt.minion.Minion(minion_opts, io_loop=io_loop)
try:
try:
@ -622,7 +619,6 @@ def test_when_passed_start_event_grains(minion_opts):
minion_opts["grains"]["os"] = "linux"
minion_opts["start_event_grains"] = ["os"]
io_loop = tornado.ioloop.IOLoop()
io_loop.make_current()
minion = salt.minion.Minion(minion_opts, io_loop=io_loop)
try:
minion.tok = MagicMock()
@ -641,7 +637,6 @@ def test_when_passed_start_event_grains(minion_opts):
@pytest.mark.slow_test
def test_when_not_passed_start_event_grains(minion_opts):
io_loop = tornado.ioloop.IOLoop()
io_loop.make_current()
minion = salt.minion.Minion(minion_opts, io_loop=io_loop)
try:
minion.tok = MagicMock()
@ -658,7 +653,6 @@ def test_when_not_passed_start_event_grains(minion_opts):
def test_when_other_events_fired_and_start_event_grains_are_set(minion_opts):
minion_opts["start_event_grains"] = ["os"]
io_loop = tornado.ioloop.IOLoop()
io_loop.make_current()
minion = salt.minion.Minion(minion_opts, io_loop=io_loop)
try:
minion.tok = MagicMock()
@ -696,7 +690,6 @@ def test_gen_modules_executors(minion_opts):
Ensure gen_modules is called with the correct arguments #54429
"""
io_loop = tornado.ioloop.IOLoop()
io_loop.make_current()
minion = salt.minion.Minion(minion_opts, io_loop=io_loop)
class MockPillarCompiler:
@ -720,7 +713,6 @@ def test_reinit_crypto_on_fork(minion_opts):
with patch("salt.utils.process.default_signals"):
io_loop = tornado.ioloop.IOLoop()
io_loop.make_current()
minion = salt.minion.Minion(minion_opts, io_loop=io_loop)
job_data = {"jid": "test-jid", "fun": "test.ping"}
@ -761,7 +753,6 @@ def test_minion_manage_schedule(minion_opts):
MagicMock(return_value=True),
):
io_loop = tornado.ioloop.IOLoop()
io_loop.make_current()
with patch("salt.utils.schedule.clean_proc_dir", MagicMock(return_value=None)):
try:
@ -821,7 +812,6 @@ def test_minion_manage_beacons(minion_opts):
minion_opts["beacons"] = {}
io_loop = tornado.ioloop.IOLoop()
io_loop.make_current()
mock_functions = {"test.ping": None}
minion = salt.minion.Minion(minion_opts, io_loop=io_loop)