Merge branch 'master' into support-timeout

Author: rafaelcaricio

elemental/client.py

@@ -37,6 +37,7 @@ def __init__(self, server_ip, user=None, api_key=None, timeout=5):
         self.user = user
         self.api_key = api_key
         self.timeout = timeout
+        self.session = requests.Session()
 
     def generate_headers(self, url=""):
         # Generate headers according to how users create ElementalLive class
@@ -66,7 +67,7 @@ def send_request(self, http_method, url, headers, body="", timeout=None):
         # Send request according to different methods
         try:
             timeout = timeout or self.timeout
-            response = requests.request(
+            response = self.session.request(
                 method=http_method, url=url, data=body, headers=headers, timeout=timeout)
 
         except requests.exceptions.RequestException as e:

elemental/client_test.py

@@ -62,57 +62,50 @@ def test_genterate_header_without_authentication_should_not_contain_user():
     assert headers['Content-Type'] == 'application/xml'
 
 
-@mock.patch('requests.request')
-def test_send_request_should_call_request_as_expected(mock_request):
-    mock_request.return_value = mock_response(status=200)
+def test_send_request_should_call_request_as_expected():
     client = ElementalLive(ELEMENTAL_ADDRESS, USER, API_KEY)
+    client.session.request = mock.MagicMock(
+        return_value=mock_response(status=200))
     client.send_request(
         'POST', f'{ELEMENTAL_ADDRESS}/live_events', HEADERS, REQUEST_BODY, timeout=TIMEOUT)
 
-    request_to_elemental = mock_request.call_args_list[0][1]
+    request_to_elemental = client.session.request.call_args_list[0][1]
     assert request_to_elemental['url'] == f'{ELEMENTAL_ADDRESS}/live_events'
     assert request_to_elemental['method'] == 'POST'
     assert request_to_elemental['headers']['Accept'] == 'application/xml'
     assert request_to_elemental['headers']['Content-Type'] == 'application/xml'
     assert request_to_elemental['timeout'] == TIMEOUT
 
 
-@mock.patch('requests.request')
-def test_send_request_should_return_response_on_correct_status_code(
-        mock_request):
+def test_send_request_should_return_response_on_correct_status_code():
     response_from_elemental_api = file_fixture('success_response_for_'
                                                'create.xml')
-    mock_request.return_value = mock_response(
-        status=201, text=response_from_elemental_api)
-
     client = ElementalLive(ELEMENTAL_ADDRESS, USER, API_KEY)
+    client.session.request = mock.MagicMock(return_value=mock_response(
+        status=201, text=response_from_elemental_api))
     response = client.send_request(
         'POST', f'{ELEMENTAL_ADDRESS}/live_events', HEADERS, REQUEST_BODY)
 
     assert response.text == response_from_elemental_api
     assert response.status_code == 201
 
 
-@mock.patch('requests.request')
-def test_send_request_should_raise_InvalidRequest_on_RequestException(
-        mock_request):
-    mock_request.side_effect = requests.exceptions.RequestException()
-
+def test_send_request_should_raise_InvalidRequest_on_RequestException():
     client = ElementalLive(ELEMENTAL_ADDRESS, USER, API_KEY)
+    client.session.request = mock.MagicMock(
+        side_effect=requests.exceptions.RequestException())
 
     with pytest.raises(InvalidRequest):
         client.send_request(
             'POST', f'{ELEMENTAL_ADDRESS}/live_events', HEADERS, REQUEST_BODY)
 
 
-@mock.patch('requests.request')
-def test_send_request_should_raise_InvalidResponse_on_invalid_status_code(
-        mock_request):
+def test_send_request_should_raise_InvalidResponse_on_invalid_status_code():
     response_from_elemental_api = file_fixture('fail_to_create_response.xml')
-    mock_request.return_value = mock_response(
-        status=404, text=response_from_elemental_api)
 
     client = ElementalLive(ELEMENTAL_ADDRESS, USER, API_KEY)
+    client.session.request = mock.MagicMock(return_value=mock_response(
+        status=404, text=response_from_elemental_api))
 
     with pytest.raises(InvalidResponse) as exc_info:
         client.send_request(