Merge pull request #582 from FlorentinD/reduce-test-warnings

Avoid db warnings in test queries

Author: FlorentinD

graphdatascience/tests/integration/test_database_ops.py

@@ -18,17 +18,15 @@ def test_switching_db(runner: Neo4jQueryRunner) -> None:
     default_database = runner.database()
     runner.run_cypher("CREATE (a: Node)")
 
-    pre_count = runner.run_cypher("MATCH (n: Node) RETURN COUNT(n) AS c")["c"][0]
+    pre_count = runner.run_cypher("MATCH (n: Node) RETURN COUNT(n) AS c").squeeze()
     assert pre_count == 1
 
     MY_DB_NAME = "my-db"
     runner.run_cypher("CREATE DATABASE $dbName WAIT", {"dbName": MY_DB_NAME})
     try:
         runner.set_database(MY_DB_NAME)
-
-        with pytest.raises(RuntimeWarning, match="One of the labels in your query is not available in the database"):
-            post_count = runner.run_cypher("MATCH (n: Node) RETURN COUNT(n) AS c")["c"][0]
-            assert post_count == 0
+        post_count = runner.run_cypher("MATCH (n) RETURN COUNT(n) AS c").squeeze()
+        assert post_count == 0
     finally:
         runner.set_database(default_database)  # type: ignore
         runner.run_cypher("MATCH (n) DETACH DELETE n")
@@ -63,16 +61,15 @@ def test_switching_db_and_use_graph(gds: GraphDataScience) -> None:
 def test_run_query_with_db(runner: Neo4jQueryRunner) -> None:
     runner.run_cypher("CREATE (a: Node)")
 
-    default_db_count = runner.run_cypher("MATCH (n: Node) RETURN COUNT(n) AS c")["c"][0]
+    default_db_count = runner.run_cypher("MATCH (n: Node) RETURN COUNT(n) AS c").squeeze()
     assert default_db_count == 1
 
     MY_DB_NAME = "my-db"
     runner.run_cypher("CREATE DATABASE $dbName WAIT", {"dbName": MY_DB_NAME})
 
     try:
-        with pytest.raises(RuntimeWarning, match="One of the labels in your query is not available in the database"):
-            specified_db_count = runner.run_cypher("MATCH (n: Node) RETURN COUNT(n) AS c", database=MY_DB_NAME)["c"][0]
-            assert specified_db_count == 0
+        specified_db_count = runner.run_cypher("MATCH (n) RETURN COUNT(n) AS c", database=MY_DB_NAME).squeeze()
+        assert specified_db_count == 0
     finally:
         runner.run_cypher("MATCH (n) DETACH DELETE n")
         runner.run_cypher("DROP DATABASE $dbName WAIT", {"dbName": MY_DB_NAME})
@@ -82,7 +79,7 @@ def test_run_query_with_db(runner: Neo4jQueryRunner) -> None:
 def test_initialize_with_db(runner: Neo4jQueryRunner) -> None:
     runner.run_cypher("CREATE (a: Node)")
 
-    default_db_count = runner.run_cypher("MATCH (n: Node) RETURN COUNT(n) AS c")["c"][0]
+    default_db_count = runner.run_cypher("MATCH (n: Node) RETURN COUNT(n) AS c").squeeze()
     assert default_db_count == 1
 
     MY_DB_NAME = "my-db"
@@ -91,11 +88,10 @@ def test_initialize_with_db(runner: Neo4jQueryRunner) -> None:
     gds_with_specified_db = GraphDataScience(URI, AUTH, database=MY_DB_NAME)
 
     try:
-        with pytest.raises(RuntimeWarning, match="One of the labels in your query is not available in the database"):
-            specified_db_count = gds_with_specified_db.run_cypher(
-                "MATCH (n: Node) RETURN COUNT(n) AS c", database=MY_DB_NAME
-            )["c"][0]
-            assert specified_db_count == 0
+        specified_db_count = gds_with_specified_db.run_cypher(
+            "MATCH (n) RETURN COUNT(n) AS c", database=MY_DB_NAME
+        ).squeeze()
+        assert specified_db_count == 0
     finally:
         runner.run_cypher("MATCH (n) DETACH DELETE n")
         runner.run_cypher("DROP DATABASE $dbName WAIT", {"dbName": MY_DB_NAME})
@@ -169,10 +165,10 @@ def test_no_db_explicitly_set() -> None:
 
 
 def test_warning_when_logging_fails(runner: Neo4jQueryRunner) -> None:
-    pool = f.ThreadPoolExecutor(1)
-    future = pool.submit(lambda: time.sleep(2))
-    with pytest.warns(RuntimeWarning, match=r"^Unable to get progress:"):
-        runner._log("DUMMY", future, "bad_database")
+    with f.ThreadPoolExecutor(1) as pool:
+        future = pool.submit(lambda: time.sleep(2))
+        with pytest.warns(RuntimeWarning, match=r"^Unable to get progress:"):
+            runner._log("DUMMY", future, "bad_database")
 
 
 def test_bookmarks(runner: Neo4jQueryRunner) -> None:

graphdatascience/tests/integration/test_graph_ops.py

@@ -1,3 +1,4 @@
+import warnings
 from typing import Generator
 
 import numpy as np
@@ -738,14 +739,23 @@ def test_graph_relationships_stream_without_arrow(gds_without_arrow: GraphDataSc
     else:
         result = gds_without_arrow.beta.graph.relationships.stream(G, ["REL", "REL2"])
 
-    with pytest.raises(DeprecationWarning):
-        expected = gds_without_arrow.run_cypher(
-            "MATCH (n)-[r]->(m) RETURN id(n) AS src_id, id(m) AS trg_id, type(r) AS rel_type"
-        )
+    warnings.filterwarnings(
+        "ignore", category=DeprecationWarning, message="The query used a deprecated function: `id`."
+    )
+    expected = gds_without_arrow.run_cypher(
+        "MATCH (n)-[r]->(m) RETURN id(n) AS src_id, id(m) AS trg_id, type(r) AS rel_type"
+    )
 
-        assert result.shape[0] == expected.shape[0]
-        for _, row in expected.iterrows():
-            assert (result == np.array(row)).all(1).any()
+    # Pandas 2.2.0 deprecated an API used by the following assertion (in the underlying impl of pandas)
+    warnings.filterwarnings(
+        "ignore",
+        category=DeprecationWarning,
+        message=r"Passing a BlockManager to TopologyDataFrame is deprecated",
+    )
+
+    assert result.shape[0] == expected.shape[0]
+    for _, row in expected.iterrows():
+        assert (result == np.array(row)).all(1).any()
 
     assert list(result.keys()) == ["sourceNodeId", "targetNodeId", "relationshipType"]