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

Fix deltaproxy tests

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

1
salt/metaproxy/deltaproxy.py
View file

@ -529,6 +529,7 @@ 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(

1
salt/minion.py
View file

@ -3264,7 +3264,6 @@ class Minion(MinionBase):
if self._running is False:
return
self.io_loop.asyncio_loop.stop()
self._running = False
if hasattr(self, "schedule"):
del self.schedule

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(), .3)
request = await asyncio.wait_for(self._socket.recv(), 0.3)
reply = await self.handle_message(None, request)
await self._socket.send(self.encode_payload(reply))
except asyncio.exceptions.TimeoutError: