Merge pull request #75 from JaviCerveraIngram/CPS-53-timeout

Cps 53 timeout

Author: marcserrat

connect/resources/base.py

@@ -90,6 +90,8 @@ def _fix_request_kwargs(self, path, prev_kwargs, **kwargs):
             fixed_kwargs['url'] = self.get_url(path)
         if 'headers' not in fixed_kwargs:
             fixed_kwargs['headers'] = self.headers
+        if 'timeout' not in fixed_kwargs:
+            fixed_kwargs['timeout'] = 300
         return fixed_kwargs
 
     @staticmethod

tests/test_conversation.py

@@ -57,6 +57,7 @@ def test_add_message(post_mock):
     post_mock.assert_called_with(
         headers={'Content-Type': 'application/json', 'Authorization': 'ApiKey XXXX:YYYYY'},
         json={'text': text},
+        timeout=300,
         url='http://localhost:8080/api/public/v1/conversations/CO-750-033-356/messages')
 
     assert isinstance(message, ConversationMessage)
@@ -85,9 +86,11 @@ def test_get_conversation_ok(get_mock):
         call(
             headers={'Content-Type': 'application/json', 'Authorization': 'ApiKey XXXX:YYYYY'},
             params={'instance_id': request.id},
+            timeout=300,
             url='http://localhost:8080/api/public/v1/conversations'),
         call(
             headers={'Content-Type': 'application/json', 'Authorization': 'ApiKey XXXX:YYYYY'},
+            timeout=300,
             url='http://localhost:8080/api/public/v1/conversations/' + conversation.id)
     ])
 
@@ -107,6 +110,7 @@ def test_get_conversation_empty(get_mock):
         call(
             headers={'Content-Type': 'application/json', 'Authorization': 'ApiKey XXXX:YYYYY'},
             params={'instance_id': request.id},
+            timeout=300,
             url='http://localhost:8080/api/public/v1/conversations')
     ])
 
@@ -129,9 +133,11 @@ def test_get_conversation_bad_deserialize(get_mock):
         call(
             headers={'Content-Type': 'application/json', 'Authorization': 'ApiKey XXXX:YYYYY'},
             params={'instance_id': request.id},
+            timeout=300,
             url='http://localhost:8080/api/public/v1/conversations'),
         call(
             headers={'Content-Type': 'application/json', 'Authorization': 'ApiKey XXXX:YYYYY'},
+            timeout=300,
             url='http://localhost:8080/api/public/v1/conversations/CO-750-033-356')
     ])
 

tests/test_directory.py

@@ -64,6 +64,7 @@ def test_list_assets(get_mock):
     get_mock.assert_called_with(
         url='http://localhost:8080/api/public/v1/assets?in(product.id,(CN-631-322-000))',
         headers={'Content-Type': 'application/json', 'Authorization': 'ApiKey XXXX:YYYYY'},
+        timeout=300,
         params=None)
 
 
@@ -76,7 +77,8 @@ def test_get_asset(get_mock):
 
     get_mock.assert_called_with(
         url='http://localhost:8080/api/public/v1/assets/AS-9861-7949-8492',
-        headers={'Content-Type': 'application/json', 'Authorization': 'ApiKey XXXX:YYYYY'})
+        headers={'Content-Type': 'application/json', 'Authorization': 'ApiKey XXXX:YYYYY'},
+        timeout=300)
 
 
 @patch('requests.get', MagicMock(return_value=_get_bad_response()))
@@ -96,7 +98,8 @@ def test_list_products(get_mock):
 
     get_mock.assert_called_with(
         url='http://localhost:8080/api/public/v1/products',
-        headers={'Content-Type': 'application/json', 'Authorization': 'ApiKey XXXX:YYYYY'})
+        headers={'Content-Type': 'application/json', 'Authorization': 'ApiKey XXXX:YYYYY'},
+        timeout=300)
 
 
 @patch('requests.get')
@@ -108,7 +111,8 @@ def test_get_product(get_mock):
 
     get_mock.assert_called_with(
         url='http://localhost:8080/api/public/v1/products/CN-783-317-575',
-        headers={'Content-Type': 'application/json', 'Authorization': 'ApiKey XXXX:YYYYY'})
+        headers={'Content-Type': 'application/json', 'Authorization': 'ApiKey XXXX:YYYYY'},
+        timeout=300)
 
 
 @patch('requests.get', MagicMock(return_value=_get_bad_response()))
@@ -129,6 +133,7 @@ def test_list_tier_configs(get_mock):
     get_mock.assert_called_with(
         url='http://localhost:8080/api/public/v1/tier/configs',
         headers={'Content-Type': 'application/json', 'Authorization': 'ApiKey XXXX:YYYYY'},
+        timeout=300,
         params={'product.id': 'CN-631-322-000'})
 
 
@@ -141,7 +146,8 @@ def test_get_tier_config(get_mock):
 
     get_mock.assert_called_with(
         url='http://localhost:8080/api/public/v1/tier/configs/TC-000-000-000',
-        headers={'Content-Type': 'application/json', 'Authorization': 'ApiKey XXXX:YYYYY'})
+        headers={'Content-Type': 'application/json', 'Authorization': 'ApiKey XXXX:YYYYY'},
+        timeout=300)
 
 
 @patch('requests.get', MagicMock(return_value=_get_bad_response()))

tests/test_models.py

@@ -221,6 +221,7 @@ def test_get_tier_config(get_mock):
         headers={
             'Content-Type': 'application/json',
             'Authorization': 'ApiKey XXXX:YYYYY'},
+        timeout=300,
         params={
             'status': 'approved',
             'configuration__product__id': 'product_id',

tests/test_usage.py

@@ -54,7 +54,8 @@ def test_get_usage_template_ok(get_mock):
     get_mock.assert_has_calls([
         call(
             url='http://localhost:8080/api/public/v1/usage/products/PRD-638-321-603/template/',
-            headers={'Content-Type': 'application/json', 'Authorization': 'ApiKey XXXX:YYYYY'}),
+            headers={'Content-Type': 'application/json', 'Authorization': 'ApiKey XXXX:YYYYY'},
+            timeout=300),
         call('...')
     ])