Merge pull request #653 from docker/fix_649

Fix stop timeout bug

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

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)