summaryrefslogtreecommitdiff
path: root/addons/document_webdav/test_davclient.py
diff options
context:
space:
mode:
Diffstat (limited to 'addons/document_webdav/test_davclient.py')
-rw-r--r--addons/document_webdav/test_davclient.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/addons/document_webdav/test_davclient.py b/addons/document_webdav/test_davclient.py
index ac40d1a3d30..c9c6bb35f28 100644
--- a/addons/document_webdav/test_davclient.py
+++ b/addons/document_webdav/test_davclient.py
@@ -324,7 +324,7 @@ class DAVClient(object):
"""An instance of a WebDAV client, connected to the OpenERP server
"""
- def __init__(self, user=None, passwd=None, dbg=0, use_ssl=False, useragent=False):
+ def __init__(self, user=None, passwd=None, dbg=0, use_ssl=False, useragent=False, timeout=None):
if use_ssl:
self.host = config.get_misc('httpsd', 'interface', False)
self.port = config.get_misc('httpsd', 'port', 8071)
@@ -346,6 +346,7 @@ class DAVClient(object):
self.user = user
self.passwd = passwd
self.dbg = dbg
+ self.timeout = timeout or 5.0 # seconds, tests need to respond pretty fast!
self.hdrs = {}
if useragent:
self.set_useragent(useragent)
@@ -386,7 +387,7 @@ class DAVClient(object):
dbg = self.dbg
hdrs.update(self.hdrs)
log.debug("Getting %s http://%s:%d/%s", method, self.host, self.port, path)
- conn = httplib.HTTPConnection(self.host, port=self.port)
+ conn = httplib.HTTPConnection(self.host, port=self.port, timeout=self.timeout)
conn.set_debuglevel(dbg)
if not path:
path = "/index.html"