Kaydet (Commit) c5d35026 authored tarafından Joffrey F's avatar Joffrey F

Set infinite timeout for the `events` method

Signed-off-by: 's avatarJoffrey F <joffrey@docker.com>
üst cb68acba
...@@ -68,9 +68,10 @@ class DaemonApiMixin(object): ...@@ -68,9 +68,10 @@ class DaemonApiMixin(object):
'until': until, 'until': until,
'filters': filters 'filters': filters
} }
url = self._url('/events')
return self._stream_helper( return self._stream_helper(
self._get(self._url('/events'), params=params, stream=True), self._get(url, params=params, stream=True, timeout=None),
decode=decode decode=decode
) )
......
...@@ -363,7 +363,7 @@ class ServiceTest(BaseAPIIntegrationTest): ...@@ -363,7 +363,7 @@ class ServiceTest(BaseAPIIntegrationTest):
self.tmp_secrets.append(secret_id) self.tmp_secrets.append(secret_id)
secret_ref = docker.types.SecretReference(secret_id, secret_name) secret_ref = docker.types.SecretReference(secret_id, secret_name)
container_spec = docker.types.ContainerSpec( container_spec = docker.types.ContainerSpec(
'busybox', ['top'], secrets=[secret_ref] 'busybox', ['sleep', '999'], secrets=[secret_ref]
) )
task_tmpl = docker.types.TaskTemplate(container_spec) task_tmpl = docker.types.TaskTemplate(container_spec)
name = self.get_service_name() name = self.get_service_name()
...@@ -388,7 +388,7 @@ class ServiceTest(BaseAPIIntegrationTest): ...@@ -388,7 +388,7 @@ class ServiceTest(BaseAPIIntegrationTest):
self.tmp_secrets.append(secret_id) self.tmp_secrets.append(secret_id)
secret_ref = docker.types.SecretReference(secret_id, secret_name) secret_ref = docker.types.SecretReference(secret_id, secret_name)
container_spec = docker.types.ContainerSpec( container_spec = docker.types.ContainerSpec(
'busybox', ['top'], secrets=[secret_ref] 'busybox', ['sleep', '999'], secrets=[secret_ref]
) )
task_tmpl = docker.types.TaskTemplate(container_spec) task_tmpl = docker.types.TaskTemplate(container_spec)
name = self.get_service_name() name = self.get_service_name()
......
...@@ -229,7 +229,7 @@ class DockerApiTest(BaseAPIClientTest): ...@@ -229,7 +229,7 @@ class DockerApiTest(BaseAPIClientTest):
url_prefix + 'events', url_prefix + 'events',
params={'since': None, 'until': None, 'filters': None}, params={'since': None, 'until': None, 'filters': None},
stream=True, stream=True,
timeout=DEFAULT_TIMEOUT_SECONDS timeout=None
) )
def test_events_with_since_until(self): def test_events_with_since_until(self):
...@@ -249,7 +249,7 @@ class DockerApiTest(BaseAPIClientTest): ...@@ -249,7 +249,7 @@ class DockerApiTest(BaseAPIClientTest):
'filters': None 'filters': None
}, },
stream=True, stream=True,
timeout=DEFAULT_TIMEOUT_SECONDS timeout=None
) )
def test_events_with_filters(self): def test_events_with_filters(self):
...@@ -268,7 +268,7 @@ class DockerApiTest(BaseAPIClientTest): ...@@ -268,7 +268,7 @@ class DockerApiTest(BaseAPIClientTest):
'filters': expected_filters 'filters': expected_filters
}, },
stream=True, stream=True,
timeout=DEFAULT_TIMEOUT_SECONDS timeout=None
) )
def _socket_path_for_client_session(self, client): def _socket_path_for_client_session(self, client):
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment