refactor: standardize test error handling by injecting err_400 and err_404 fixtures

kan-fu · kan-fu · commit 4f878eff5be9 · 2026-04-22T11:49:15.000-07:00
diff --git a/pyproject.toml b/pyproject.toml
@@ -85,3 +85,6 @@ testpaths = [
 addopts = [
     "--import-mode=importlib",
 ]
+markers = [
+    "slow: marks tests as slow (deselect with '-m \"not slow\"')",
+]
diff --git a/tests/archive_file/test_archivefile_device.py b/tests/archive_file/test_archivefile_device.py
@@ -20,9 +20,9 @@ def params_multiple_pages(params):
     return params | {"rowLimit": 2}
 
 
-def test_invalid_param_value(requester, params):
+def test_invalid_param_value(requester, params, err_400):
     params_invalid_param_value = params | {"deviceCode": "XYZ123"}
-    with pytest.raises(requests.HTTPError, match=r"API Error 127"):
+    with pytest.raises(requests.HTTPError, match=err_400):
         requester.getArchivefile(params_invalid_param_value)
 
 
@@ -32,9 +32,9 @@ def test_invalid_params_missing_required(requester, params):
         requester.getArchivefile(params)
 
 
-def test_invalid_param_name(requester, params):
+def test_invalid_param_name(requester, params, err_400):
     params_invalid_param_name = params | {"deviceCodes": "BPR-Folger-59"}
-    with pytest.raises(requests.HTTPError, match=r"API Error 129"):
+    with pytest.raises(requests.HTTPError, match=err_400):
         requester.getArchivefile(params_invalid_param_name)
 
 
diff --git a/tests/archive_file/test_archivefile_download.py b/tests/archive_file/test_archivefile_download.py
@@ -4,13 +4,13 @@
 import requests
 
 
-def test_invalid_param_value(requester):
-    with pytest.raises(requests.HTTPError, match=r"API Error 96"):
+def test_invalid_param_value(requester, err_400):
+    with pytest.raises(requests.HTTPError, match=err_400):
         requester.downloadArchivefile("FAKEFILE.XYZ")
 
 
-def test_invalid_params_missing_required(requester):
-    with pytest.raises(requests.HTTPError, match=r"API Error 128"):
+def test_invalid_params_missing_required(requester, err_400):
+    with pytest.raises(requests.HTTPError, match=err_400):
         requester.downloadArchivefile()
 
 
diff --git a/tests/archive_file/test_archivefile_location.py b/tests/archive_file/test_archivefile_location.py
@@ -2,9 +2,9 @@
 import requests
 
 
-def test_invalid_param_value(requester, params_location):
+def test_invalid_param_value(requester, params_location, err_400):
     params_invalid_param_value = params_location | {"locationCode": "XYZ123"}
-    with pytest.raises(requests.HTTPError, match=r"API Error 127"):
+    with pytest.raises(requests.HTTPError, match=err_400):
         requester.getArchivefile(params_invalid_param_value)
 
 
@@ -14,18 +14,18 @@ def test_invalid_params_missing_required(requester, params_location):
         requester.getArchivefile(params_location)
 
 
-def test_invalid_param_name(requester, params_location):
+def test_invalid_param_name(requester, params_location, err_400):
     params_invalid_param_name = params_location | {"locationCodes": "NCBC"}
-    with pytest.raises(requests.HTTPError, match=r"API Error 129"):
+    with pytest.raises(requests.HTTPError, match=err_400):
         requester.getArchivefile(params_invalid_param_name)
 
 
-def test_no_data(requester, params_location):
+def test_no_data(requester, params_location, err_400):
     params_no_data = params_location | {
         "dateFrom": "2000-01-01",
         "dateTo": "2000-01-02",
     }
-    with pytest.raises(requests.HTTPError, match=r"API Error 127"):
+    with pytest.raises(requests.HTTPError, match=err_400):
         requester.getArchivefile(params_no_data)
 
 
diff --git a/tests/conftest.py b/tests/conftest.py
@@ -1,6 +1,6 @@
 import os
 from pathlib import Path
-
+import requests
 import pytest
 from dotenv import load_dotenv
 from onc import ONC
@@ -18,6 +18,15 @@ def pytest_configure():
 def requester(tmp_path) -> ONC:
     return ONC(production=is_prod, outPath=tmp_path)
 
+@pytest.fixture
+def err_400():
+    return f"{requests.codes.bad} Client Error"
+
+
+@pytest.fixture
+def err_404():
+    return f"{requests.codes.not_found} Client Error"
+
 
 @pytest.fixture(scope="session")
 def util():
diff --git a/tests/data_product_delivery/test_data_product_delivery_cancel.py b/tests/data_product_delivery/test_data_product_delivery_cancel.py
@@ -2,6 +2,6 @@
 import requests
 
 
-def test_invalid_request_id(requester):
-    with pytest.raises(requests.HTTPError, match=r"API Error 127"):
+def test_invalid_request_id(requester, err_400):
+    with pytest.raises(requests.HTTPError, match=err_400):
         requester.cancelDataProduct(1234567890)
diff --git a/tests/data_product_delivery/test_data_product_delivery_download.py b/tests/data_product_delivery/test_data_product_delivery_download.py
@@ -2,6 +2,6 @@
 import requests
 
 
-def test_invalid_run_id(requester):
-    with pytest.raises(requests.HTTPError, match=r"API Error 127"):
+def test_invalid_run_id(requester, err_400):
+    with pytest.raises(requests.HTTPError, match=err_400):
         requester.downloadDataProduct(1234567890)
diff --git a/tests/data_product_delivery/test_data_product_delivery_order.py b/tests/data_product_delivery/test_data_product_delivery_order.py
@@ -2,12 +2,13 @@
 import requests
 
 
-def test_invalid_param_value(requester, params):
+def test_invalid_param_value(requester, params, err_400):
     params_invalid_param_value = params | {"dataProductCode": "XYZ123"}
-    with pytest.raises(requests.HTTPError, match=r"API Error 127"):
+    with pytest.raises(requests.HTTPError, match=err_400):
         requester.orderDataProduct(params_invalid_param_value)
 
 
+@pytest.mark.slow
 def test_valid_default(requester, params, expected_keys_download_results, util):
     data = requester.orderDataProduct(params)
 
@@ -30,6 +31,7 @@ def test_valid_default(requester, params, expected_keys_download_results, util):
     )
 
 
+@pytest.mark.slow
 def test_valid_no_metadata(requester, params, expected_keys_download_results, util):
     data = requester.orderDataProduct(params, includeMetadataFile=False)
 
@@ -49,6 +51,7 @@ def test_valid_no_metadata(requester, params, expected_keys_download_results, ut
     )
 
 
+@pytest.mark.slow
 def test_valid_results_only(requester, params, expected_keys_download_results, util):
     data = requester.orderDataProduct(params, downloadResultsOnly=True)
 
diff --git a/tests/data_product_delivery/test_data_product_delivery_restart.py b/tests/data_product_delivery/test_data_product_delivery_restart.py
@@ -2,6 +2,6 @@
 import requests
 
 
-def test_invalid_request_id(requester):
-    with pytest.raises(requests.HTTPError, match=r"API Error 127"):
+def test_invalid_request_id(requester, err_400):
+    with pytest.raises(requests.HTTPError, match=err_400):
         requester.restartDataProduct(1234567890)
diff --git a/tests/data_product_delivery/test_data_product_delivery_run.py b/tests/data_product_delivery/test_data_product_delivery_run.py
@@ -2,6 +2,6 @@
 import requests
 
 
-def test_invalid_request_id(requester):
-    with pytest.raises(requests.HTTPError, match=r"API Error 127"):
+def test_invalid_request_id(requester, err_400):
+    with pytest.raises(requests.HTTPError, match=err_400):
         requester.runDataProduct(1234567890)
diff --git a/tests/data_product_delivery/test_data_product_delivery_status.py b/tests/data_product_delivery/test_data_product_delivery_status.py
@@ -2,6 +2,6 @@
 import requests
 
 
-def test_invalid_request_id(requester):
-    with pytest.raises(requests.HTTPError, match=r"API Error 127"):
+def test_invalid_request_id(requester, err_400):
+    with pytest.raises(requests.HTTPError, match=err_400):
         requester.checkDataProduct(1234567890)
diff --git a/tests/data_product_delivery/test_integration.py b/tests/data_product_delivery/test_integration.py
@@ -1,6 +1,7 @@
 import pytest
 
 
+@pytest.mark.slow
 def test_valid_manual(requester, params, expected_keys_download_results, util):
     """
     Test request -> status -> run -> download -> status.
@@ -35,6 +36,7 @@ def test_valid_manual(requester, params, expected_keys_download_results, util):
     assert data_status_after_download["searchHdrStatus"] == "COMPLETED"
 
 
+@pytest.mark.slow
 def test_valid_cancel_restart(requester, params, expected_keys_download_results, util):
     """
     Test request -> run -> cancel -> download (fail) -> restart -> download.
diff --git a/tests/discover_data_availability/test_data_availability.py b/tests/discover_data_availability/test_data_availability.py
@@ -12,9 +12,9 @@ def params():
     }
 
 
-def test_invalid_param_value(requester, params):
+def test_invalid_param_value(requester, params, err_400):
     params_invalid_param_value = params | {"locationCode": "INVALID"}
-    with pytest.raises(requests.HTTPError, match=r"API Error 127"):
+    with pytest.raises(requests.HTTPError, match=err_400):
         requester.getDataAvailability(params_invalid_param_value)
 
 
diff --git a/tests/discover_data_products/test_data_products.py b/tests/discover_data_products/test_data_products.py
@@ -2,25 +2,25 @@
 import requests
 
 
-def test_invalid_param_value(requester):
+def test_invalid_param_value(requester, err_400):
     params_invalid_param_value = {"dataProductCode": "XYZ123"}
-    with pytest.raises(requests.HTTPError, match=r"API Error 127"):
+    with pytest.raises(requests.HTTPError, match=err_400):
         requester.getDataProducts(params_invalid_param_value)
 
 
-def test_invalid_param_name(requester):
+def test_invalid_param_name(requester, err_400):
     params_invalid_param_name = {"dataProductCodes": "HSD"}
-    with pytest.raises(requests.HTTPError, match=r"API Error 129"):
+    with pytest.raises(requests.HTTPError, match=err_400):
         requester.getDataProducts(params_invalid_param_name)
 
 
-def test_no_data(requester):
+def test_no_data(requester, err_404):
     params_no_data = {
         "dataProductCode": "HSD",
         "extension": "txt",
     }
 
-    with pytest.raises(requests.HTTPError, match=r"404 Client Error"):
+    with pytest.raises(requests.HTTPError, match=err_404):
         requester.getDataProducts(params_no_data)
 
 
diff --git a/tests/discover_deployments/test_deployments.py b/tests/discover_deployments/test_deployments.py
@@ -2,46 +2,46 @@
 import requests
 
 
-def test_invalid_time_range_greater_start_time(requester):
+def test_invalid_time_range_greater_start_time(requester, err_400):
     params_invalid_time_range_greater_start_time = {
         "locationCode": "BACAX",
         "deviceCategoryCode": "CTD",
         "dateFrom": "2020-01-01",
         "dateTo": "2019-01-01",
     }
-    with pytest.raises(requests.HTTPError, match=r"API Error 23"):
+    with pytest.raises(requests.HTTPError, match=err_400):
         requester.getDeployments(params_invalid_time_range_greater_start_time)
 
 
-def test_invalid_time_range_future_start_time(requester):
+def test_invalid_time_range_future_start_time(requester, err_400):
     params_invalid_time_range_future_start_time = {
         "locationCode": "BACAX",
         "deviceCategoryCode": "CTD",
         "dateFrom": "2050-01-01",
     }
-    with pytest.raises(requests.HTTPError, match=r"API Error 25"):
+    with pytest.raises(requests.HTTPError, match=err_400):
         requester.getDeployments(params_invalid_time_range_future_start_time)
 
 
-def test_invalid_param_value(requester):
+def test_invalid_param_value(requester, err_400):
     params_invalid_param_value = {"locationCode": "XYZ123", "deviceCategoryCode": "CTD"}
-    with pytest.raises(requests.HTTPError, match=r"API Error 127"):
+    with pytest.raises(requests.HTTPError, match=err_400):
         requester.getDeployments(params_invalid_param_value)
 
 
-def test_invalid_param_name(requester):
+def test_invalid_param_name(requester, err_400):
     params_invalid_param_name = {"locationCodes": "BACAX", "deviceCategoryCode": "CTD"}
-    with pytest.raises(requests.HTTPError, match=r"API Error 129"):
+    with pytest.raises(requests.HTTPError, match=err_400):
         requester.getDeployments(params_invalid_param_name)
 
 
-def test_no_data(requester):
+def test_no_data(requester, err_400):
     params_no_data = {
         "locationCode": "BACAX",
         "deviceCategoryCode": "CTD",
         "dateTo": "1900-01-01",
     }
-    with pytest.raises(requests.HTTPError, match=r"API Error 127"):
+    with pytest.raises(requests.HTTPError, match=err_400):
         requester.getDeployments(params_no_data)
 
 
diff --git a/tests/discover_device_categories/test_device_categories.py b/tests/discover_device_categories/test_device_categories.py
@@ -2,25 +2,25 @@
 import requests
 
 
-def test_invalid_param_value(requester):
+def test_invalid_param_value(requester, err_400):
     params_invalid_param_value = {"deviceCategoryCode": "XYZ123"}
-    with pytest.raises(requests.HTTPError, match=r"API Error 127"):
+    with pytest.raises(requests.HTTPError, match=err_400):
         requester.getDeviceCategories(params_invalid_param_value)
 
 
-def test_invalid_param_name(requester):
+def test_invalid_param_name(requester, err_400):
     params_invalid_param_name = {"deviceCategoryCodes": "CTD"}
-    with pytest.raises(requests.HTTPError, match=r"API Error 129"):
+    with pytest.raises(requests.HTTPError, match=err_400):
         requester.getDeviceCategories(params_invalid_param_name)
 
 
-def test_no_data(requester):
+def test_no_data(requester, err_404):
     params_no_data = {
         "deviceCategoryCode": "CTD",
         "deviceCategoryName": "Conductivity",
         "description": "TemperatureXXX",
     }
-    with pytest.raises(requests.HTTPError, match=r"404 Client Error"):
+    with pytest.raises(requests.HTTPError, match=err_404):
         requester.getDeviceCategories(params_no_data)
 
 
diff --git a/tests/discover_devices/test_devices.py b/tests/discover_devices/test_devices.py
@@ -2,40 +2,40 @@
 import requests
 
 
-def test_invalid_time_range_greater_start_time(requester):
+def test_invalid_time_range_greater_start_time(requester, err_400):
     params_invalid_time_range_greater_start_time = {
         "deviceCode": "BPR-Folger-59",
         "dateFrom": "2020-01-01",
         "dateTo": "2019-01-01",
     }
-    with pytest.raises(requests.HTTPError, match=r"API Error 23"):
+    with pytest.raises(requests.HTTPError, match=err_400):
         requester.getDevices(params_invalid_time_range_greater_start_time)
 
 
-def test_invalid_time_range_future_start_time(requester):
+def test_invalid_time_range_future_start_time(requester, err_400):
     params_invalid_time_range_future_start_time = {
         "deviceCode": "BPR-Folger-59",
         "dateFrom": "2050-01-01",
     }
-    with pytest.raises(requests.HTTPError, match=r"API Error 25"):
+    with pytest.raises(requests.HTTPError, match=err_400):
         requester.getDevices(params_invalid_time_range_future_start_time)
 
 
-def test_invalid_param_value(requester):
+def test_invalid_param_value(requester, err_400):
     params_invalid_param_value = {"deviceCode": "XYZ123"}
-    with pytest.raises(requests.HTTPError, match=r"API Error 127"):
+    with pytest.raises(requests.HTTPError, match=err_400):
         requester.getDevices(params_invalid_param_value)
 
 
-def test_invalid_param_name(requester):
+def test_invalid_param_name(requester, err_400):
     params_invalid_param_name = {"deviceCodes": "BPR-Folger-59"}
-    with pytest.raises(requests.HTTPError, match=r"API Error 129"):
+    with pytest.raises(requests.HTTPError, match=err_400):
         requester.getDevices(params_invalid_param_name)
 
 
-def test_no_data(requester):
+def test_no_data(requester, err_404):
     params_no_data = {"deviceCode": "BPR-Folger-59", "dateTo": "1900-01-01"}
-    with pytest.raises(requests.HTTPError, match=r"404 Client Error"):
+    with pytest.raises(requests.HTTPError, match=err_404):
         requester.getDevices(params_no_data)
 
 
diff --git a/tests/discover_locations/test_locations.py b/tests/discover_locations/test_locations.py
diff --git a/tests/discover_locations/test_locations_tree.py b/tests/discover_locations/test_locations_tree.py
diff --git a/tests/discover_properties/test_properties.py b/tests/discover_properties/test_properties.py
diff --git a/tests/raw_data/test_rawdata_device.py b/tests/raw_data/test_rawdata_device.py
diff --git a/tests/raw_data/test_rawdata_location.py b/tests/raw_data/test_rawdata_location.py
diff --git a/tests/scalar_data/test_scalardata_device.py b/tests/scalar_data/test_scalardata_device.py
diff --git a/tests/scalar_data/test_scalardata_location.py b/tests/scalar_data/test_scalardata_location.py

Original file line number	Diff line number	Diff line change
`@@ -85,3 +85,6 @@ testpaths = [`
`85`	`85`	`addopts = [`
`86`	`86`	`"--import-mode=importlib",`
`87`	`87`	`]`
	`88`	`+markers = [`
	`89`	`+ "slow: marks tests as slow (deselect with '-m \"not slow\"')",`
	`90`	`+]`