[ARVADOS] created: 2.1.0-661-g80f26d7ff

[Git user]

        at  80f26d7ffad85dc15a89bbf6f33a66e206832704 (commit)


commit 80f26d7ffad85dc15a89bbf6f33a66e206832704
Merge: 703df0d6a 6e4cb07dd
Author: Lucas Di Pentima <lucas at di-pentima.com.ar>
Date:   Thu Apr 15 14:10:01 2021 -0300

    17171: Merge branch 'master' into 17171-pysdk-timeout-fix
    
    Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <lucas at di-pentima.com.ar>


commit 703df0d6a247b1a2794239da71a0c6ee3fd525a4
Author: Lucas Di Pentima <lucas at di-pentima.com.ar>
Date:   Thu Apr 15 14:08:07 2021 -0300

    17171: Fixes the bug by removing the default timeout value.
    
    Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <lucas at di-pentima.com.ar>

diff --git a/sdk/python/arvados/api.py b/sdk/python/arvados/api.py
index 315fc74a7..1d8a13045 100644
--- 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:

commit 7b3836631ed085a3debb43bebeff9a06c15505c3
Author: Lucas Di Pentima <lucas at di-pentima.com.ar>
Date:   Thu Apr 15 14:07:36 2021 -0300

    17171: Exposes bug with a test.
    
    Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <lucas at di-pentima.com.ar>

diff --git a/sdk/python/tests/test_api.py b/sdk/python/tests/test_api.py
index 8d3142ab6..8fb364356 100644
--- 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': (

-----------------------------------------------------------------------


hooks/post-receive
--