docker
/
docker-py
mirror of https://github.com/docker/docker-py.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Set infinite timeout for the `events` method 

Signed-off-by: Joffrey F <joffrey@docker.com>
This commit is contained in:
Joffrey F 2017-03-22 16:13:33 -07:00
parent cb68acbaae
commit c5d35026ce
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
docker/api/daemon.py
View File

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

4
tests/integration/api_service_test.py
View File

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

6
tests/unit/api_test.py
View File

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