File tree Expand file tree Collapse file tree 3 files changed +20
-4
lines changed
services/activation/engine
tests/integration/services/activation/engine Expand file tree Collapse file tree 3 files changed +20
-4
lines changed Original file line number Diff line number Diff line change @@ -48,9 +48,7 @@ def _get_podman_socket_url() -> str:
48
48
49
49
def get_podman_client () -> PodmanClient :
50
50
"""Podman client factory."""
51
- params = {}
52
- if settings .PODMAN_SOCKET_TIMEOUT :
53
- params ["timeout" ] = settings .PODMAN_SOCKET_TIMEOUT
51
+ params = {"timeout" : settings .PODMAN_SOCKET_TIMEOUT }
54
52
podman_url = _get_podman_socket_url ()
55
53
params ["base_url" ] = podman_url
56
54
LOGGER .info (f"Using podman socket: { podman_url } " )
Original file line number Diff line number Diff line change @@ -362,7 +362,10 @@ def _config_authentication_backends():
362
362
"ws://" , "http://"
363
363
).replace ("wss://" , "https://" )
364
364
PODMAN_SOCKET_URL = settings .get ("PODMAN_SOCKET_URL" , None )
365
- PODMAN_SOCKET_TIMEOUT = settings .get ("PODMAN_SOCKET_TIMEOUT" , None )
365
+ PODMAN_SOCKET_TIMEOUT = settings .get ("PODMAN_SOCKET_TIMEOUT" , default = 0 )
366
+ # zero raises an exception, None takes the socket default
367
+ if PODMAN_SOCKET_TIMEOUT == 0 :
368
+ PODMAN_SOCKET_TIMEOUT = None
366
369
PODMAN_MEM_LIMIT = settings .get ("PODMAN_MEM_LIMIT" , "200m" )
367
370
PODMAN_ENV_VARS = settings .get ("PODMAN_ENV_VARS" , {})
368
371
PODMAN_MOUNTS = settings .get ("PODMAN_MOUNTS" , [])
Original file line number Diff line number Diff line change 46
46
)
47
47
48
48
from .utils import InitData , get_ansible_rulebook_cmdline , get_request
49
+ from aap_eda .settings .default import settings as orig_dynaconf_settings
49
50
50
51
DATA_DIR = Path (__file__ ).parent / "data"
51
52
@@ -150,6 +151,20 @@ def test_get_podman_client_with_timeout(settings):
150
151
assert client .api .timeout == 10
151
152
152
153
154
+ def test_get_podman_client_with_zero_timeout ():
155
+ """Test setting the timeout for the Podman client to zero."""
156
+ with mock .patch ("aap_eda.settings.default.settings.get" ) as get_mock :
157
+
158
+ def get_side_effect (* args , ** kwargs ):
159
+ if args [0 ] == "PODMAN_SOCKET_TIMEOUT" :
160
+ return 0
161
+ return orig_dynaconf_settings .get (* args , ** kwargs )
162
+
163
+ get_mock .side_effect = get_side_effect
164
+ client = get_podman_client ()
165
+ assert client .api .timeout is None
166
+
167
+
153
168
def test_get_podman_client (settings ):
154
169
settings .PODMAN_SOCKET_URL = None
155
170
uid_0_mock = mock .Mock (return_value = 0 )
You can’t perform that action at this time.
0 commit comments