Run >5.21 driver tests based on pytest mark

Author: FlorentinD

graphdatascience/tests/integration/conftest.py

@@ -194,10 +194,9 @@ def pytest_collection_modifyitems(config: Any, items: Any) -> None:
         server_version = gds._server_version
     except Exception as e:
         print("Could not derive GDS library server version")
-        gds.close()
         raise e
-
-    gds.close()
+    finally:
+        gds.close()
 
     skip_incompatible_versions = pytest.mark.skip(reason=f"incompatible with GDS server version {server_version}")
 
@@ -211,3 +210,17 @@ def pytest_collection_modifyitems(config: Any, items: Any) -> None:
 
             if "max_exclusive" in kwargs and kwargs["max_exclusive"] <= server_version:
                 item.add_marker(skip_incompatible_versions)
+
+    db_driver_version = Neo4jQueryRunner._NEO4J_DRIVER_VERSION
+    skip_incompatible_driver_version = pytest.mark.skip(reason=f"incompatible with driver version {db_driver_version}")
+
+    for item in items:
+        for mark in item.iter_markers(name="compatible_with_db_driver"):
+            kwargs = mark.kwargs
+
+            if "min_inclusive" in kwargs and kwargs["min_inclusive"] > db_driver_version:
+                item.add_marker(skip_incompatible_driver_version)
+                continue
+
+            if "max_exclusive" in kwargs and kwargs["max_exclusive"] <= db_driver_version:
+                item.add_marker(skip_incompatible_driver_version)

graphdatascience/tests/integration/test_error_handling.py

@@ -4,7 +4,6 @@
 from neo4j import Driver, GraphDatabase
 
 from graphdatascience import GraphDataScience
-from graphdatascience.query_runner.neo4j_query_runner import Neo4jQueryRunner
 from graphdatascience.server_version.server_version import ServerVersion
 from graphdatascience.tests.integration.conftest import AUTH, URI
 
@@ -210,20 +209,20 @@ def test_forward_server_side_warning(gds: GraphDataScience) -> None:
 
 
 @pytest.mark.filterwarnings("ignore: notification warnings are a preview feature")
+@pytest.mark.compatible_with_db_driver(min_inclusive=ServerVersion(5, 21, 0))
 def test_forward_driver_configured_warning(warning_driver: Driver) -> None:
-    if Neo4jQueryRunner._NEO4J_DRIVER_VERSION >= ServerVersion(5, 21, 0):
-        gds = GraphDataScience(warning_driver)
+    gds = GraphDataScience(warning_driver)
 
-        with pytest.raises(Warning, match="The query used a deprecated function: `id`."):
-            gds.run_cypher("MATCH (n) RETURN id(n)")
+    with pytest.raises(Warning, match="The query used a deprecated function: `id`."):
+        gds.run_cypher("MATCH (n) RETURN id(n)")
 
 
 def test_filter_out_client_related__warning(gds: GraphDataScience) -> None:
     gds.graph.drop("g", failIfMissing=False)
 
 
 @pytest.mark.filterwarnings("ignore: notification warnings are a preview feature")
+@pytest.mark.compatible_with_db_driver(min_inclusive=ServerVersion(5, 21, 0))
 def test_filter_out_client_related__driver_configured_warning(warning_driver: Driver) -> None:
-    if Neo4jQueryRunner._NEO4J_DRIVER_VERSION >= ServerVersion(5, 21, 0):
-        gds = GraphDataScience(warning_driver)
-        gds.graph.drop("g", failIfMissing=False)
+    gds = GraphDataScience(warning_driver)
+    gds.graph.drop("g", failIfMissing=False)

graphdatascience/tests/pytest.ini

@@ -4,6 +4,7 @@ markers =
     encrypted_only: mark a test as requiring GDS with either bolt or https ssl.policy configured.
     model_store_location: mark a test as a requiring neo4j config for gds.model.store_location
     compatible_with: mark a test as only being compatible with certain GDS server versions
+    compatible_with_db_driver: mark a test as only being compatible with a certain Neo4j driver version
     skip_on_aura: mark a test to not be run when targeting an AuraDS instance
     only_on_aura: mark a test to be run only when targeting an AuraDS instance
     ogb: mark a test as requiring the ogb dependency