From a2bebacc07d1427b2005a0a47fe734d043c94e2f Mon Sep 17 00:00:00 2001 From: "Daniel A. Wozniak" Date: Wed, 17 May 2023 00:20:19 -0700 Subject: [PATCH] Remove cruft --- salt/metaproxy/proxy.py | 2 +- tests/pytests/functional/channel/test_server.py | 2 +- .../functional/netapi/rest_tornado/test_webhooks_handler.py | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/salt/metaproxy/proxy.py b/salt/metaproxy/proxy.py index 21566ff6453..1700e35027d 100644 --- a/salt/metaproxy/proxy.py +++ b/salt/metaproxy/proxy.py @@ -54,7 +54,7 @@ from salt.utils.process import SignalHandlingProcess, default_signals log = logging.getLogger(__name__) - +@salt.ext.tornado.gen.coroutine def post_master_init(self, master): """ Function to finish init after a proxy diff --git a/tests/pytests/functional/channel/test_server.py b/tests/pytests/functional/channel/test_server.py index 6460d84a8c9..86415cafa27 100644 --- a/tests/pytests/functional/channel/test_server.py +++ b/tests/pytests/functional/channel/test_server.py @@ -168,7 +168,7 @@ def test_pub_server_channel( p = Path(str(master_config["sock_dir"])) / "workers.ipc" start = time.time() while not p.exists(): - time.sleep(.3) + time.sleep(0.3) if time.time() - start > 20: raise Exception("IPC socket not created") mode = os.lstat(p).st_mode diff --git a/tests/pytests/functional/netapi/rest_tornado/test_webhooks_handler.py b/tests/pytests/functional/netapi/rest_tornado/test_webhooks_handler.py index 611a548937e..3f40c765489 100644 --- a/tests/pytests/functional/netapi/rest_tornado/test_webhooks_handler.py +++ b/tests/pytests/functional/netapi/rest_tornado/test_webhooks_handler.py @@ -30,7 +30,6 @@ async def test_hook_can_handle_get_parameters(http_client, app, content_type_map ) assert response.code == 200 host = urllib.parse.urlparse(response.effective_url).netloc - print(event.fire_event.calls) event.fire_event.assert_called_once_with( { "headers": {