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

stop(), restart(): Adjust request timeout. 

Signed-off-by: Matthieu Nottale <matthieu.nottale@docker.com>
This commit is contained in:
Matthieu Nottale 2018-03-13 15:31:36 +01:00 committed by Joffrey F
parent caf0f37927
commit cef9940ed3
3 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
docker/api/container.py
View File

@ -1018,7 +1018,10 @@ class ContainerApiMixin(object):
"""
params = {'t': timeout}
url = self._url("/containers/{0}/restart", container)
res = self._post(url, params=params)
conn_timeout = self.timeout
if conn_timeout:
conn_timeout = max(conn_timeout, timeout+15)
res = self._post(url, params=params, timeout=conn_timeout)
self._raise_for_status(res)
@utils.check_resource('container')
@ -1107,9 +1110,11 @@ class ContainerApiMixin(object):
else:
params = {'t': timeout}
url = self._url("/containers/{0}/stop", container)
conn_timeout = self.timeout
if conn_timeout:
conn_timeout = max(conn_timeout, timeout + 15)
res = self._post(url, params=params,
timeout=(timeout + (self.timeout or 0)))
timeout=conn_timeout)
self._raise_for_status(res)
@utils.check_resource('container')

11
tests/integration/api_container_test.py
View File

@ -1165,6 +1165,17 @@ class RestartContainerTest(BaseAPIIntegrationTest):
assert info2['State']['Running'] is True
self.client.kill(id)
def test_restart_with_hight_timeout(self):
container = self.client.create_container(BUSYBOX, ['sleep', '9999'])
id = container['Id']
self.client.start(id)
self.client.timeout = 1
self.client.restart(id, timeout=3)
self.client.timeout = None
self.client.restart(id, timeout=3)
self.client.timeout = 1
self.client.stop(id, timeout=3)
def test_restart_with_dict_instead_of_id(self):
container = self.client.create_container(BUSYBOX, ['sleep', '9999'])
assert 'Id' in container

4
tests/unit/api_container_test.py
View File

@ -1264,7 +1264,7 @@ class ContainerTest(BaseAPIClientTest):
'POST',
url_prefix + 'containers/3cc2351ab11b/stop',
params={'t': timeout},
timeout=(DEFAULT_TIMEOUT_SECONDS + timeout)
timeout=(DEFAULT_TIMEOUT_SECONDS)
)
def test_stop_container_with_dict_instead_of_id(self):
@ -1277,7 +1277,7 @@ class ContainerTest(BaseAPIClientTest):
'POST',
url_prefix + 'containers/3cc2351ab11b/stop',
params={'t': timeout},
timeout=(DEFAULT_TIMEOUT_SECONDS + timeout)
timeout=(DEFAULT_TIMEOUT_SECONDS)
)
def test_pause_container(self):