From 7b374707acfc8d8023968ab784df8736eaaeb2da Mon Sep 17 00:00:00 2001 From: "Daniel A. Wozniak" Date: Tue, 18 Jul 2023 20:17:39 -0700 Subject: [PATCH] Adjust timeouts to get passing tests --- salt/metaproxy/deltaproxy.py | 1 - salt/transport/zeromq.py | 2 +- tests/pytests/integration/minion/test_return_retries.py | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/salt/metaproxy/deltaproxy.py b/salt/metaproxy/deltaproxy.py index 223b611e959..f977ddef485 100644 --- a/salt/metaproxy/deltaproxy.py +++ b/salt/metaproxy/deltaproxy.py @@ -529,7 +529,6 @@ def subproxy_post_master_init(minion_id, uid, opts, main_proxy, main_utils): exc, exc_info=True, ) - return {"proxy_minion": None, "proxy_opts": {}} # Reload the grains proxy_grains = salt.loader.grains( diff --git a/salt/transport/zeromq.py b/salt/transport/zeromq.py index eae1558e724..b02f9e276f3 100644 --- a/salt/transport/zeromq.py +++ b/salt/transport/zeromq.py @@ -553,7 +553,7 @@ class RequestServer(salt.transport.base.DaemonizedRequestServer): async def request_handler(self): while not self._event.is_set(): try: - request = await asyncio.wait_for(self._socket.recv(), 1) + request = await asyncio.wait_for(self._socket.recv(), .3) reply = await self.handle_message(None, request) await self._socket.send(self.encode_payload(reply)) except asyncio.exceptions.TimeoutError: diff --git a/tests/pytests/integration/minion/test_return_retries.py b/tests/pytests/integration/minion/test_return_retries.py index 1706825fc69..74d80d1fe81 100644 --- a/tests/pytests/integration/minion/test_return_retries.py +++ b/tests/pytests/integration/minion/test_return_retries.py @@ -28,7 +28,7 @@ def salt_minion_retry(salt_master_factory, salt_minion_id): @pytest.mark.slow_test def test_publish_retry(salt_master, salt_minion_retry, salt_cli, salt_run_cli): # run job that takes some time for warmup - rtn = salt_cli.run("test.sleep", "5", "--async", minion_tgt=salt_minion_retry.id) + rtn = salt_cli.run("test.sleep", "7", "--async", minion_tgt=salt_minion_retry.id) # obtain JID jid = rtn.stdout.strip().split(" ")[-1]