summaryrefslogtreecommitdiff
path: root/tests/unit/utils.py
diff options
context:
space:
mode:
authorMonty Taylor <mordred@inaugust.com>2015-03-29 01:38:16 -0400
committerMonty Taylor <mordred@inaugust.com>2015-03-30 17:01:02 -0400
commitf5a473edfc03bebcd429766f76299bc9e132250c (patch)
tree21a980251755f3e99b232352b6b887895307b13a /tests/unit/utils.py
parentc9f79e641c6906e95095f3e0e505f9bd3f715bc2 (diff)
downloadpython-swiftclient-f5a473edfc03bebcd429766f76299bc9e132250c.tar.gz
Add socket-level read timeout parameter
The underlying requests library supports a timeout input parameter. The other python-*client libraries support passing it in, so while working on shade, it seemed like a great idea to be able to pass in timeout to swiftclient too. For reference, there's a change in shade: I095c1240693abf024bda2315dd77f4400b24a45b that shows interaction with the other libs, and a tentative patch that would consume this one. Change-Id: I699ebb1e092aa010af678de7ba15712da6ed5315
Diffstat (limited to 'tests/unit/utils.py')
-rw-r--r--tests/unit/utils.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/unit/utils.py b/tests/unit/utils.py
index 3e87ea2..4958c13 100644
--- a/tests/unit/utils.py
+++ b/tests/unit/utils.py
@@ -220,7 +220,7 @@ class MockHttpTest(testtools.TestCase):
on_request = kwargs.get('on_request')
def wrapper(url, proxy=None, cacert=None, insecure=False,
- ssl_compression=True):
+ ssl_compression=True, timeout=None):
if storage_url:
self.assertEqual(storage_url, url)