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

Adjust timeouts to get passing tests

Browse source
This commit is contained in:
Daniel A. Wozniak 2023-07-18 20:17:39 -07:00 • committed by Gareth J. Greenaway
parent 52239d808c
commit 7b374707ac
3 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
salt/metaproxy/deltaproxy.py
View file

@ -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(

2
salt/transport/zeromq.py
View file

@ -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:

2
tests/pytests/integration/minion/test_return_retries.py
View file

@ -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]