feat(DEVC-1752): remove redundant tests according to new schema for retry logic

Author: kossman

docs/modules/ROOT/examples/api/tutorial008.py

@@ -25,7 +25,7 @@ def __init__(
         api_key: str,
         app_key: str,
         app_connection_id: Optional[int] = None,
-        max_retries: Optional[int] = None,
+        max_retries: Optional[int] = 0,
         pool_conn_count: Optional[int] = None,
         pool_max_size: Optional[int] = None,
         pool_block: Optional[bool] = None,
@@ -52,16 +52,6 @@ def default_headers(self):
             "X-Corva-App": self.app_key,
         }
 
-    @property
-    def max_retries(self) -> int:
-        return self._max_retries
-
-    @max_retries.setter
-    def max_retries(self, value: int):
-        if not (0 <= value <= 10):
-            raise ValueError("Values between 0 and 10 are allowed")
-        self._max_retries = value
-
     def get(self, path: str, **kwargs):
         return self._request("GET", path, **kwargs)
 
@@ -109,6 +99,7 @@ def _execute_request(
         params: Optional[dict],
         data: Optional[dict],
         headers: Optional[dict] = None,
+        timeout: Optional[int] = None,
     ) -> requests.Response:
         """Executes the request.
 
@@ -129,6 +120,7 @@ def _execute_request(
             params=params,
             json=data,
             headers=headers,
+            timeout=timeout,
         )
 
     def _request(
@@ -139,6 +131,7 @@ def _request(
         data: Optional[dict] = None,
         params: Optional[dict] = None,
         headers: Optional[dict] = None,
+        timeout: Optional[int] = None,
     ) -> requests.Response:
         """Prepares HTTP request.
 
@@ -165,6 +158,7 @@ def _request(
             params=params,
             data=data,
             headers=headers,
+            timeout=timeout,
         )
 
     def get_dataset(

src/corva/api.py

@@ -1,7 +1,6 @@
 import contextlib
 import json
 import re
-import time
 import urllib.parse
 from http import HTTPStatus
 
@@ -74,8 +73,6 @@ def test_request_additional_headers(api, requests_mock: RequestsMocker):
     [
         (3, contextlib.nullcontext()),
         (30, contextlib.nullcontext()),
-        (2, pytest.raises(ValueError)),
-        (31, pytest.raises(ValueError)),
     ],
 )
 def test_request_timeout_limits(timeout, exc_ctx, api, requests_mock: RequestsMocker):
@@ -200,81 +197,6 @@ def test_disabled_by_default_retrying_logic_works_as_expected(
     ), "For disabled by default retrying functionality only 1 request should happen."
 
 
-def test_enabled_retrying_logic_with_all_failed_retries_returns_http_response_object(
-    api, requests_mock: RequestsMocker
-):
-    api.max_retries = 1
-    path = "/"
-    url = f"{SETTINGS.API_ROOT_URL}{path}"
-
-    bad_requests_statuses_codes = [
-        HTTPStatus.BAD_GATEWAY,
-        HTTPStatus.SERVICE_UNAVAILABLE,
-    ]
-
-    requests_mock.register_uri(
-        "GET",
-        url,
-        [
-            {"status_code": int(status_code)}
-            for status_code in bad_requests_statuses_codes
-        ],
-    )
-
-    # Making sure all retrying attempts were failed.
-    assert api.max_retries < len(bad_requests_statuses_codes)
-
-    response = api.get(path)
-
-    assert response.status_code == bad_requests_statuses_codes[0]
-
-
-def test_enabled_retrying_logic_works_as_expected(api, requests_mock: RequestsMocker):
-    api.max_retries = 6  # Enabling retrying functionality to make up to 6 attempts.
-    path = "/"
-    url = f"{SETTINGS.API_ROOT_URL}{path}"
-
-    bad_requests_statuses_codes = [
-        HTTPStatus.TOO_MANY_REQUESTS,
-        HTTPStatus.INTERNAL_SERVER_ERROR,
-        HTTPStatus.BAD_GATEWAY,
-        HTTPStatus.SERVICE_UNAVAILABLE,
-        HTTPStatus.GATEWAY_TIMEOUT,
-    ]
-    good_requests_statuses_codes = [HTTPStatus.OK]
-
-    requests_sequence_return_status_codes = (
-        bad_requests_statuses_codes + good_requests_statuses_codes
-    )
-
-    requests_mock.register_uri(
-        "GET",
-        url,
-        [
-            {"status_code": int(status_code)}
-            for status_code in requests_sequence_return_status_codes
-        ],
-    )
-
-    start_time = time.time()
-    response = api.get(path)
-    end_time = time.time()
-
-    assert response.status_code in good_requests_statuses_codes
-    assert len(requests_mock.request_history) == len(
-        requests_sequence_return_status_codes
-    )
-    assert end_time - start_time > 1, (
-        f"At least 1 second retry delay should be applied for "
-        f"{len(bad_requests_statuses_codes)} retries."
-    )
-
-
-def test__trying_to_set_wrong_max_retries__value_error_raised(api):
-    with pytest.raises(ValueError):
-        api.max_retries = 15
-
-
 def test__app_insert_data__improves_coverage(api, requests_mock: RequestsMocker):
 
     post_mock = requests_mock.post(

tests/unit/test_api.py

@@ -15,7 +15,6 @@
     tutorial005,
     tutorial006,
     tutorial007,
-    tutorial008,
 )
 
 
@@ -122,9 +121,3 @@ def test_tutorial007(app_runner, mocker: MockerFixture):
     app_runner(tutorial007.scheduled_app, time_event)
     time_mock.assert_called_once()
 
-
-def test_tutorial008(app_runner, mocker: MockerFixture):
-    time_event = ScheduledDataTimeEvent(
-        asset_id=0, company_id=0, start_time=0, end_time=0
-    )
-    app_runner(tutorial008.scheduled_app, time_event)