From 30fac5b8799a50fbe837a674de15408c001f3f0e Mon Sep 17 00:00:00 2001 From: Joffrey F Date: Wed, 24 Jun 2015 22:58:56 +0200 Subject: Fix stop timeout bug --- docker/client.py | 2 +- tests/integration_test.py | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/docker/client.py b/docker/client.py index f63da50..8bcc419 100644 --- a/docker/client.py +++ b/docker/client.py @@ -1101,7 +1101,7 @@ class Client(requests.Session): url = self._url("/containers/{0}/stop".format(container)) res = self._post(url, params=params, - timeout=(timeout + self.timeout)) + timeout=(timeout + (self.timeout or 0))) self._raise_for_status(res) @check_resource diff --git a/tests/integration_test.py b/tests/integration_test.py index c9ab140..4b9869e 100644 --- a/tests/integration_test.py +++ b/tests/integration_test.py @@ -1467,6 +1467,11 @@ class TestRegressions(BaseTestCase): result = self.client.containers(all=True, trunc=True) self.assertEqual(len(result[0]['Id']), 12) + def test_649(self): + self.client.timeout = None + ctnr = self.client.create_container('busybox', ['sleep', '2']) + self.client.start(ctnr) + self.client.stop(ctnr) if __name__ == '__main__': c = docker.Client(base_url=DEFAULT_BASE_URL) -- cgit v1.2.1