17989: Reverts default PySDK timeout to 5 minutes. Updates test.

Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <lucas.dipentima@curii.com>

diff --git a/sdk/python/arvados/api.py b/sdk/python/arvados/api.py
index 55b1e22b78a9add1588d46f24047d5a9a8aa7c1c..86d24dfc06a7edf8cf73ac315904f8b4bfb3a908 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=10, **kwargs):
+        request_id=None, timeout=5*60, **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 9b944f6c53e7ec0abc4d323d83d7ba0aece43741..0c4677e8a26e1245c2049bc11e7e25fa5e0d7b22 100644 (file)
--- a/sdk/python/tests/test_api.py
+++ b/sdk/python/tests/test_api.py
@@ -101,13 +101,11 @@ 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, 10,
-            "Default timeout value should be 10")
+        self.assertEqual(api._http.timeout, 300,
+            "Default timeout value should be 300")
 
-    # Checks for bug #17989
     def test_custom_request_timeout(self):
         api = arvados.api('v1', timeout=1234)
         self.assertEqual(api._http.timeout, 1234,