f -> test_func

sedr/ogcapi10.py

@@ -15,7 +15,7 @@ def requirement9_1(jsondata: dict) -> tuple[bool, str]:
 
     Test that the landing page contains required elements.
 
-    TODO: See https://github.com/metno/sedr/issues/6
+    TODO: See https://github.com/metno/sedr/issues/6 - Should landing page in json only be tested if correct conformance class exists?
     """
     spec_ref = f"{ogc_api_common_url}#_7c772474-7037-41c9-88ca-5c7e95235389"
 

sedr/preflight.py

@@ -51,12 +51,12 @@ def main():
         return False
 
     # Run tests for landing
-    for f in util.test_functions["landing"]:
-        status, msg = f(landing_json)
+    for test_func in util.test_functions["landing"]:
+        status, msg = test_func(jsondata=landing_json)
         if not status:
-            util.logger.error("Test %s failed with message: %s", f.__name__, msg)
+            util.logger.error("Test %s failed with message: %s", test_func.__name__, msg)
         else:
-            util.logger.info("Test %s passed. (%s)", f.__name__, msg)
+            util.logger.info("Test %s passed. (%s)", test_func.__name__, msg)
 
     # Get conformance
     conformance_is_reachable, conformance_json = fetch_conformance(
@@ -66,12 +66,12 @@ def main():
         return False
 
     # Run tests for conformance page
-    for f in util.test_functions["conformance"]:
-        status, msg = f(conformance_json)
+    for test_func in util.test_functions["conformance"]:
+        status, msg = test_func(conformance_json)
         if not status:
-            util.logger.error("Test %s failed with message: %s", f.__name__, msg)
+            util.logger.error("Test %s failed with message: %s", test_func.__name__, msg)
         else:
-            util.logger.debug("Test %s passed. (%s)", f.__name__, msg)
+            util.logger.debug("Test %s passed. (%s)", test_func.__name__, msg)
 
     util.logger.info("Preflight checks done.")
     return True

sedr/schemat.py

@@ -116,12 +116,12 @@ def test_edr_collections(case):
         )
 
         # Run edr, ogc, profile tests
-        for f in util.test_functions["collection"]:
-            status, msg = f(collection_json)
+        for test_func in util.test_functions["collection"]:
+            status, msg = test_func(jsondata=collection_json)
             if not status:
-                util.logger.error("Test %s failed with message: %s", f.__name__, msg)
-                raise AssertionError(f"Test {f.__name__} failed with message: {msg}")
-            util.logger.info("Test %s passed. (%s)", f.__name__, msg)
+                util.logger.error("Test %s failed with message: %s", test_func.__name__, msg)
+                raise AssertionError(f"Test {test_func.__name__} failed with message: {msg}")
+            util.logger.info("Test %s passed. (%s)", test_func.__name__, msg)
 
         # Validation of spatial_bbox done above
         extent = util.parse_spatial_bbox(collection_json)