refactor: streamline test_timeout_cloudantv1_sessionauth

Author: eiri

test/integration/test_timeout.py

@@ -87,6 +87,21 @@ def get_authenticate_arguments(req):
 
     @staticmethod
     def get_request_arguments(tci, srv, idx, call_count=None):
+        """
+        Retrieve the arguments passed to a mocked HTTP request.
+
+        Parameters:
+        tci (unittest.mock.Mock): A Mock object used for assertions.
+        srv (Service): The instance of CloudantV1 service.
+        idx (int): The index of the request in srv.http_client.request.mock_calls.
+        call_count (int, optional): The total call count for the request. Defaults to None.
+
+        Returns:
+        list: The arguments passed to the HTTP request at the specified index.
+
+        Raises:
+        AssertionError: If the actual call count of the request does not match the provided or calculated call_count.
+        """
         call_count = idx + 1 if call_count is None else call_count
         tci.assertEqual(srv.http_client.request.call_count, call_count)
         return srv.http_client.request.mock_calls[idx]
@@ -146,23 +161,24 @@ def test_timeout_cloudantv1_sessionauth(self):
         # Mock out request response
         Helpers.mock_out_cloudant_request(my_service)
 
-        testcases = Helpers.defineTestCases(my_service)
+        # Call the server
+        my_service.get_server_information()
 
-        for tc_num, tc in enumerate(testcases):
-            tc['set_timeout'](CUSTOM_TIMEOUT_CONFIG)
+        # Assert timeout is set to the authenticator
+        auth_args = Helpers.get_request_arguments(self, my_service.authenticator.token_manager, 0, call_count=2)
+        self.assertEqual(auth_args.kwargs['timeout'], DEFAULT_TIMEOUT)
 
-            # Call the server
-            my_service.get_server_information()
+        # Assert timeout is set to the server request
+        req_args = Helpers.get_request_arguments(self, my_service, 1, call_count=2)
+        self.assertEqual(req_args.kwargs['timeout'], DEFAULT_TIMEOUT)
 
-            # first call is to a _session end-point, so we have an additional call on our mock request
-            if tc_num == 0:
-                # Assert timeout is set to the authenticator
-                auth_args = Helpers.get_request_arguments(self, my_service.authenticator.token_manager, tc_num, tc_num+2)
-                Helpers.assert_default_timeout_setting(self, auth_args)
+        # Set a custom timeout and repeat the request. Client should be already authenticated.
+        my_service.set_http_config(CUSTOM_TIMEOUT_CONFIG)
+        my_service.get_server_information()
 
-            # Assert timeout is set in the server request
-            req_args = Helpers.get_request_arguments(self, my_service, tc_num+1, tc_num+2)
-            tc['assert_func'](self, req_args)
+        # Assert the custom timeout is set to the server request
+        req_args = Helpers.get_request_arguments(self, my_service, 2, call_count=3)
+        self.assertEqual(req_args.kwargs['timeout'], CUSTOM_TIMEOUT)
 
     def test_timeout_cloudantv1_iamauth(self):
         authenticator = IAMAuthenticator('apikey')