Skip to content

Commit a89faa4

Browse files
committed
Set infinite timeout for the events method
Signed-off-by: Joffrey F <[email protected]>
1 parent bbad864 commit a89faa4

File tree

3 files changed

+7
-6
lines changed

3 files changed

+7
-6
lines changed

docker/api/daemon.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,9 +68,10 @@ def events(self, since=None, until=None, filters=None, decode=None):
6868
'until': until,
6969
'filters': filters
7070
}
71+
url = self._url('/events')
7172

7273
return self._stream_helper(
73-
self._get(self._url('/events'), params=params, stream=True),
74+
self._get(url, params=params, stream=True, timeout=None),
7475
decode=decode
7576
)
7677

tests/integration/api_service_test.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -363,7 +363,7 @@ def test_create_service_with_secret(self):
363363
self.tmp_secrets.append(secret_id)
364364
secret_ref = docker.types.SecretReference(secret_id, secret_name)
365365
container_spec = docker.types.ContainerSpec(
366-
'busybox', ['top'], secrets=[secret_ref]
366+
'busybox', ['sleep', '999'], secrets=[secret_ref]
367367
)
368368
task_tmpl = docker.types.TaskTemplate(container_spec)
369369
name = self.get_service_name()
@@ -388,7 +388,7 @@ def test_create_service_with_unicode_secret(self):
388388
self.tmp_secrets.append(secret_id)
389389
secret_ref = docker.types.SecretReference(secret_id, secret_name)
390390
container_spec = docker.types.ContainerSpec(
391-
'busybox', ['top'], secrets=[secret_ref]
391+
'busybox', ['sleep', '999'], secrets=[secret_ref]
392392
)
393393
task_tmpl = docker.types.TaskTemplate(container_spec)
394394
name = self.get_service_name()

tests/unit/api_test.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ def test_events(self):
229229
url_prefix + 'events',
230230
params={'since': None, 'until': None, 'filters': None},
231231
stream=True,
232-
timeout=DEFAULT_TIMEOUT_SECONDS
232+
timeout=None
233233
)
234234

235235
def test_events_with_since_until(self):
@@ -249,7 +249,7 @@ def test_events_with_since_until(self):
249249
'filters': None
250250
},
251251
stream=True,
252-
timeout=DEFAULT_TIMEOUT_SECONDS
252+
timeout=None
253253
)
254254

255255
def test_events_with_filters(self):
@@ -268,7 +268,7 @@ def test_events_with_filters(self):
268268
'filters': expected_filters
269269
},
270270
stream=True,
271-
timeout=DEFAULT_TIMEOUT_SECONDS
271+
timeout=None
272272
)
273273

274274
def _socket_path_for_client_session(self, client):

0 commit comments

Comments
 (0)