[incubator-openwhisk] branch master updated: Bump wskadmin's request timeout. (#3832)

[du...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

dubeejw pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk.git


The following commit(s) were added to refs/heads/master by this push:
     new e3e5abd  Bump wskadmin's request timeout. (#3832)
e3e5abd is described below

commit e3e5abd71cd76e93a29f4cfa94b4d164d4214535
Author: Markus Thömmes <ma...@me.com>
AuthorDate: Tue Jul 3 01:49:02 2018 +0200

    Bump wskadmin's request timeout. (#3832)
    
    This fails ever so often in Travis for no good reason. Bumping to 60 seconds shouldn't harm.
---
 tools/admin/wskutil.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/admin/wskutil.py b/tools/admin/wskutil.py
index 13d379f..e23de2a 100644
--- a/tools/admin/wskutil.py
+++ b/tools/admin/wskutil.py
@@ -37,7 +37,7 @@ import socket
 # on HTTPS connections
 httpRequestProps = {'secure': True}
 
-def request(method, urlString, body = '', headers = {}, auth = None, verbose = False, https_proxy = os.getenv('https_proxy', None), timeout = 10):
+def request(method, urlString, body = '', headers = {}, auth = None, verbose = False, https_proxy = os.getenv('https_proxy', None), timeout = 60):
     url = urlparse(urlString)
     if url.scheme == 'http':
         conn = HTTPConnection(url.netloc, timeout = timeout)