code cleanup

Author: timmarkhuff

test/unit/test_http_retries.py

@@ -20,35 +20,30 @@ def groundlight_fixture() -> Groundlight:
     return gl
 
 
-@pytest.fixture(name="retry_detector_name")
-def retry_detector_name_fixture(detector_name) -> str:
-    return detector_name("test detector")
-
-
 @pytest.fixture(name="detector")
-def detector_fixture(gl: Groundlight, retry_detector_name: str) -> Detector:
+def detector_fixture(gl: Groundlight, detector_name: Callable) -> Detector:
     return gl.get_or_create_detector(
-        name=retry_detector_name, query="Is there a dog?", confidence_threshold=DEFAULT_CONFIDENCE_THRESHOLD
+        name=detector_name(), query="Is there a dog?", confidence_threshold=DEFAULT_CONFIDENCE_THRESHOLD
     )
 
 
-def test_create_detector_attempts_retries(gl: Groundlight, retry_detector_name: str):
+def test_create_detector_attempts_retries(gl: Groundlight, detector_name: Callable):
     run_test(
         mocked_call="urllib3.PoolManager.request",
         api_method=gl.create_detector,
         expected_call_counts=TOTAL_RETRIES + 1,
-        name=retry_detector_name,
+        name=detector_name(),
         query="Is there a dog?",
         confidence_threshold=DEFAULT_CONFIDENCE_THRESHOLD,
     )
 
 
-def test_get_or_create_detector_attempts_retries(gl: Groundlight, retry_detector_name: str):
+def test_get_or_create_detector_attempts_retries(gl: Groundlight, detector_name: Callable):
     run_test(
         mocked_call="requests.request",
         api_method=gl.get_or_create_detector,
         expected_call_counts=TOTAL_RETRIES + 1,
-        name=retry_detector_name,
+        name=detector_name(),
         query="Is there a dog?",
         confidence_threshold=DEFAULT_CONFIDENCE_THRESHOLD,
     )
@@ -63,12 +58,12 @@ def test_get_detector_attempts_retries(gl: Groundlight, detector: Detector):
     )
 
 
-def test_get_detector_by_name_attempts_retries(gl: Groundlight, retry_detector_name: str):
+def test_get_detector_by_name_attempts_retries(gl: Groundlight, detector_name: Callable):
     run_test(
         mocked_call="requests.request",
         api_method=gl.get_detector_by_name,
         expected_call_counts=TOTAL_RETRIES + 1,
-        name=retry_detector_name,
+        name=detector_name(),
     )
 
 
@@ -78,12 +73,12 @@ def test_list_detectors_attempts_retries(gl: Groundlight):
     )
 
 
-def test_submit_image_query_attempts_retries(gl: Groundlight, retry_detector_name: str):
+def test_submit_image_query_attempts_retries(gl: Groundlight, detector_name: Callable):
     run_test(
         mocked_call="urllib3.PoolManager.request",
         api_method=gl.submit_image_query,
         expected_call_counts=TOTAL_RETRIES + 1,
-        detector=retry_detector_name,
+        detector=detector_name(),
         image=IMAGE_FILE,
         wait=1,
     )