Check inside_ci via method not via fixture

Author: FlorentinD

graphdatascience/tests/integrationV2/conftest.py

@@ -13,7 +13,7 @@ def pytest_collection_modifyitems(config: Any, items: Any) -> None:
             if "integrationV2" in str(item.fspath):
                 item.add_marker(skip_v2)
 
-    if os.environ.get("BUILD_NUMBER") is not None:
+    if inside_ci():
         skip_ci = pytest.mark.skip(reason="Skipping db_integration tests in CI")
         for item in items:
             if "db_integration" in item.keywords:
@@ -29,6 +29,5 @@ def logs_dir(tmp_path_factory: pytest.TempPathFactory) -> Generator[Path, None,
     yield tmp_dir
 
 
-@pytest.fixture(scope="session")
 def inside_ci() -> bool:
     return os.environ.get("BUILD_NUMBER") is not None

graphdatascience/tests/integrationV2/procedure_surface/arrow/conftest.py

@@ -9,6 +9,7 @@
 from graphdatascience import QueryRunner
 from graphdatascience.arrow_client.authenticated_flight_client import AuthenticatedArrowClient
 from graphdatascience.session.dbms_connection_info import DbmsConnectionInfo
+from graphdatascience.tests.integrationV2.conftest import inside_ci
 from graphdatascience.tests.integrationV2.procedure_surface.conftest import (
     GdsSessionConnectionInfo,
     create_arrow_client,
@@ -22,9 +23,9 @@
 
 @pytest.fixture(scope="package")
 def session_connection(
-    network: Network, password_dir: Path, logs_dir: Path, inside_ci: bool
+    network: Network, password_dir: Path, logs_dir: Path
 ) -> Generator[GdsSessionConnectionInfo, None, None]:
-    yield from start_session(inside_ci, logs_dir, network, password_dir)
+    yield from start_session(logs_dir, network, password_dir)
 
 
 @pytest.fixture(scope="package")
@@ -33,10 +34,10 @@ def arrow_client(session_connection: DockerContainer) -> AuthenticatedArrowClien
 
 
 @pytest.fixture(scope="package")
-def neo4j_connection(network: Network, logs_dir: Path, inside_ci: bool) -> Generator[DbmsConnectionInfo, None, None]:
-    if inside_ci:
+def neo4j_connection(network: Network, logs_dir: Path) -> Generator[DbmsConnectionInfo, None, None]:
+    if inside_ci():
         raise RuntimeError("Communication between Session and DB is not supported yet in CI.")
-    yield from start_database(inside_ci, logs_dir, network)
+    yield from start_database(logs_dir, network)
 
 
 @pytest.fixture(scope="package")

graphdatascience/tests/integrationV2/procedure_surface/conftest.py

@@ -16,6 +16,7 @@
 from graphdatascience.arrow_client.authenticated_flight_client import AuthenticatedArrowClient
 from graphdatascience.query_runner.neo4j_query_runner import Neo4jQueryRunner
 from graphdatascience.session.dbms_connection_info import DbmsConnectionInfo
+from graphdatascience.tests.integrationV2.conftest import inside_ci
 
 LOGGER = logging.getLogger(__name__)
 
@@ -55,7 +56,7 @@ def latest_neo4j_version() -> str:
 
 
 def start_session(
-    inside_ci: bool, logs_dir: Path, network: Network, password_dir: Path
+    logs_dir: Path, network: Network, password_dir: Path
 ) -> Generator[GdsSessionConnectionInfo, None, None]:
     if (session_uri := os.environ.get("GDS_SESSION_URI")) is not None:
         uri_parts = session_uri.split(":")
@@ -76,7 +77,7 @@ def start_session(
         .with_exposed_ports(8491)
         .with_volume_mapping(password_dir, "/passwords")
     )
-    if not inside_ci:
+    if not inside_ci():
         session_container = session_container.with_network(network).with_network_aliases("gds-session")
     with session_container as session_container:
         wait_for_logs(session_container, "Running GDS tasks: 0")
@@ -90,7 +91,7 @@ def start_session(
         if stderr:
             print(f"Error logs from session container:\n{stderr}")
 
-        if inside_ci:
+        if inside_ci():
             print(f"Session container logs:\n{stdout}")
 
         out_file = logs_dir / "session_container.log"
@@ -109,7 +110,7 @@ def create_arrow_client(session_uri: GdsSessionConnectionInfo) -> AuthenticatedA
     )
 
 
-def start_database(inside_ci: bool, logs_dir: Path, network: Network) -> Generator[DbmsConnectionInfo, None, None]:
+def start_database(logs_dir: Path, network: Network) -> Generator[DbmsConnectionInfo, None, None]:
     default_neo4j_image = (
         f"europe-west1-docker.pkg.dev/neo4j-aura-image-artifacts/aura/neo4j-enterprise:{latest_neo4j_version()}"
     )
@@ -142,7 +143,7 @@ def start_database(inside_ci: bool, logs_dir: Path, network: Network) -> Generat
         if stderr:
             print(f"Error logs from database container:\n{stderr}")
 
-        if inside_ci:
+        if inside_ci():
             print(f"Database container logs:\n{stdout}")
 
         out_file = db_logs_dir / "stdout.log"

graphdatascience/tests/integrationV2/procedure_surface/cypher/conftest.py

@@ -11,11 +11,12 @@
 from graphdatascience import QueryRunner
 from graphdatascience.query_runner.gds_arrow_client import GdsArrowClient
 from graphdatascience.query_runner.neo4j_query_runner import Neo4jQueryRunner
+from graphdatascience.tests.integrationV2.conftest import inside_ci
 
 
 @pytest.fixture(scope="package")
 def gds_plugin_container(
-    logs_dir: Path, inside_ci: bool, tmp_path_factory: pytest.TempPathFactory
+    logs_dir: Path, tmp_path_factory: pytest.TempPathFactory
 ) -> Generator[Neo4jContainer, None, None]:
     neo4j_image = os.getenv("NEO4J_DATABASE_IMAGE", "neo4j:enterprise")
 
@@ -58,7 +59,7 @@ def gds_plugin_container(
         if stderr:
             print(f"Error logs from Neo4j container:\n{stderr}")
 
-        if inside_ci:
+        if inside_ci():
             print(f"Neo4j container logs:\n{stdout}")
 
         out_file = db_logs_dir / "stdout.log"

graphdatascience/tests/integrationV2/procedure_surface/session/conftest.py

@@ -18,9 +18,9 @@
 
 @pytest.fixture(scope="package")
 def session_connection(
-    network: Network, password_dir: Path, logs_dir: Path, inside_ci: bool
+    network: Network, password_dir: Path, logs_dir: Path
 ) -> Generator[GdsSessionConnectionInfo, None, None]:
-    yield from start_session(inside_ci, logs_dir, network, password_dir)
+    yield from start_session(logs_dir, network, password_dir)
 
 
 @pytest.fixture(scope="package")
@@ -29,8 +29,8 @@ def arrow_client(session_connection: GdsSessionConnectionInfo) -> AuthenticatedA
 
 
 @pytest.fixture(scope="package")
-def neo4j_connection(network: Network, logs_dir: Path, inside_ci: bool) -> Generator[DbmsConnectionInfo, None, None]:
-    yield from start_database(inside_ci, logs_dir, network)
+def neo4j_connection(network: Network, logs_dir: Path) -> Generator[DbmsConnectionInfo, None, None]:
+    yield from start_database(logs_dir, network)
 
 
 @pytest.fixture(scope="package")