From c74feac52d298ed7c1608600c663f62b07988e0d Mon Sep 17 00:00:00 2001 From: Warren Turkal Date: Tue, 29 Jul 2014 15:43:56 -0700 Subject: [PATCH] Add ability to set timeout on client. Signed-off-by: Warren Turkal --- docker/client.py | 3 +++ tests/test.py | 8 ++++++++ 2 files changed, 11 insertions(+) diff --git a/docker/client.py b/docker/client.py index a7f1f49853..81ca8707bf 100644 --- a/docker/client.py +++ b/docker/client.py @@ -757,6 +757,9 @@ def search(self, term): params={'term': term}), True) + def set_timeout(self, timeout): + self._timeout = timeout + def start(self, container, binds=None, port_bindings=None, lxc_conf=None, publish_all_ports=False, links=None, privileged=False, dns=None, dns_search=None, volumes_from=None, network_mode=None): diff --git a/tests/test.py b/tests/test.py index 791fe08b33..a46bdb4d48 100644 --- a/tests/test.py +++ b/tests/test.py @@ -123,6 +123,14 @@ def test_info(self): timeout=docker.client.DEFAULT_TIMEOUT_SECONDS ) + def test_set_timeout(self): + try: + self.client.set_timeout(15) + except Exception as e: + self.fail('Command should not raise exception: {0}'.format(e)) + + assert self.client._timeout == 15 + def test_search(self): try: self.client.search('busybox')