17171: Merge branch 'master' into 17171-pysdk-timeout-fix

Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <lucas@di-pentima.com.ar>

diff --git a/sdk/python/arvados/api.py b/sdk/python/arvados/api.py
index 315fc74a713f42fbee7b7b030c36576ed5426bc0..1d8a13045006795d3955bbd07ba559c0d9de5abc 100644 (file)
--- a/sdk/python/arvados/api.py
+++ b/sdk/python/arvados/api.py
@@ -157,7 +157,7 @@ def http_cache(data_type):
     return cache.SafeHTTPCache(path, max_age=60*60*24*2)
 
 def api(version=None, cache=True, host=None, token=None, insecure=False,
-        request_id=None, timeout=5*60, **kwargs):
+        request_id=None, timeout=None, **kwargs):
     """Return an apiclient Resources object for an Arvados instance.
 
     :version:

diff --git a/sdk/python/tests/test_api.py b/sdk/python/tests/test_api.py
index 8d3142ab6aa49980babae66e255d2f183224109e..8fb364356f5afb7bbb67c72f3cbc56bec7ecda77 100644 (file)
--- a/sdk/python/tests/test_api.py
+++ b/sdk/python/tests/test_api.py
@@ -101,6 +101,12 @@ class ArvadosApiTest(run_test_server.TestCaseWithServers):
             text = "X" * maxsize
             arvados.api('v1').collections().create(body={"manifest_text": text}).execute()
 
+    # Checks for bug #17171
+    def test_default_request_timeout(self):
+        api = arvados.api('v1')
+        self.assertEqual(api._http.timeout, None,
+            "Default timeout value shouldn't be set")
+
     def test_ordered_json_model(self):
         mock_responses = {
             'arvados.humans.get': (