17171: Sets default timeout on arvados.api() to 10 seconds.

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 1d8a13045006795d3955bbd07ba559c0d9de5abc..4fe3999f2c3098391f387f51fe96cc628bf1a790 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=None, **kwargs):
+        request_id=None, timeout=10, **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 8fb364356f5afb7bbb67c72f3cbc56bec7ecda77..60183e06a352259530534bedf56da1bbba5c3443 100644 (file)
--- a/sdk/python/tests/test_api.py
+++ b/sdk/python/tests/test_api.py
@@ -104,8 +104,8 @@ class ArvadosApiTest(run_test_server.TestCaseWithServers):
     # 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")
+        self.assertEqual(api._http.timeout, 10,
+            "Default timeout value should be 10")
 
     def test_ordered_json_model(self):
         mock_responses = {