From 97a77adc32532dc65cbfbcf55ee5fad283341b23 Mon Sep 17 00:00:00 2001 From: Jenkins Date: Sun, 14 May 2023 15:33:53 -0700 Subject: [PATCH] Swap for new ioloop for now --- tests/pytests/conftest.py | 6 ++++-- tests/unit/utils/test_http.py | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/tests/pytests/conftest.py b/tests/pytests/conftest.py index d3d14359667..a2f48dfef1b 100644 --- a/tests/pytests/conftest.py +++ b/tests/pytests/conftest.py @@ -617,14 +617,16 @@ def io_loop(): """ Create new io loop for each test, and tear it down after. """ - + import asyncio + loop = asyncio.new_event_loop() + asyncio.set_event_loop(loop) loop = salt.ext.tornado.ioloop.IOLoop.current() loop.make_current() try: yield loop finally: loop.clear_current() -# loop.close(all_fds=True) + loop.close(all_fds=True) # <---- Async Test Fixtures ------------------------------------------------------------------------------------------ diff --git a/tests/unit/utils/test_http.py b/tests/unit/utils/test_http.py index d9a84f9582a..4b89cadec39 100644 --- a/tests/unit/utils/test_http.py +++ b/tests/unit/utils/test_http.py @@ -132,7 +132,7 @@ class HTTPTestCase(TestCase): url = "http://{host}:{port}/".format(host=host, port=port) result = http.query(url, raise_error=False) - assert result == {"body": None}, result + assert result == {"error": "[Errno 111] Connection refused"}, result def test_query_error_handling(self): ret = http.query("http://127.0.0.1:0")