refactor: move client fixtures from conftest into test files

Each test file now defines its own client fixtures instead of sharing
them via conftest.py. This makes dependencies explicit and allows
shorter, context-appropriate names:

- test_stress_sync.py / test_benchmark_sync.py: sync_client
- test_stress_async.py: async_client (native) + benchmark_client (sync-wrapped)
- test_benchmark_async.py: benchmark_client (sync-wrapped)

Also splits the former tuple-returning fixture into separate
event_loop and client fixtures, and adds proper type annotations
to fix mypy no-untyped-def errors.

Author: mlwelles

tests/conftest.py

@@ -279,15 +279,6 @@ def movies_schema_content(movies_schema: Path) -> str:
     return movies_schema.read_text()
 
 
-@pytest.fixture
-def stress_test_sync_client(
-    _sync_client_clean: DgraphClient, movies_schema_content: str
-) -> DgraphClient:
-    """Sync client with movies test schema for stress tests."""
-    _sync_client_clean.alter(pydgraph.Operation(schema=movies_schema_content))
-    return _sync_client_clean
-
-
 # =============================================================================
 # Async Client Fixtures
 # =============================================================================
@@ -317,56 +308,3 @@ async def async_client_clean(async_client: AsyncDgraphClient) -> AsyncDgraphClie
     """Async client with clean database."""
     await async_client.alter(pydgraph.Operation(drop_all=True))
     return async_client
-
-
-@pytest.fixture
-async def stress_test_async_client(
-    async_client_clean: AsyncDgraphClient,
-    movies_schema_content: str,
-) -> AsyncDgraphClient:
-    """Async client with movies test schema for stress tests."""
-    await async_client_clean.alter(pydgraph.Operation(schema=movies_schema_content))
-    return async_client_clean
-
-
-# =============================================================================
-# Sync-wrapped Async Client Fixtures (for benchmark tests)
-# =============================================================================
-# These fixtures create async clients using their own event loop, avoiding
-# conflicts with pytest-asyncio's event loop when using benchmark fixtures.
-# The event loop is stored alongside the client so it can be reused.
-
-
-@pytest.fixture
-def stress_test_async_client_for_benchmark(
-    movies_schema_content: str,
-) -> Generator[tuple[AsyncDgraphClient, asyncio.AbstractEventLoop], None, None]:
-    """Async client with schema and its event loop for benchmarking.
-
-    Returns a tuple of (client, loop) so tests can run async operations
-    using the same event loop the client was created with.
-    """
-    loop = asyncio.new_event_loop()
-    asyncio.set_event_loop(loop)
-
-    schema_content = movies_schema_content  # Capture for closure
-
-    async def setup() -> AsyncDgraphClient:
-        client_stub = AsyncDgraphClientStub(TEST_SERVER_ADDR)
-        client = AsyncDgraphClient(client_stub)
-        for _ in range(30):
-            try:
-                await client.login("groot", "password")
-                break
-            except Exception as e:
-                if "user not found" in str(e):
-                    raise
-                await asyncio.sleep(0.1)
-        await client.alter(pydgraph.Operation(drop_all=True))
-        await client.alter(pydgraph.Operation(schema=schema_content))
-        return client
-
-    client = loop.run_until_complete(setup())
-    yield (client, loop)
-    loop.run_until_complete(client.close())
-    loop.close()

tests/test_benchmark_async.py

@@ -16,18 +16,64 @@
 
 from __future__ import annotations
 
+import asyncio
+from collections.abc import Generator
 from typing import TYPE_CHECKING
 
+import pytest
+
 import pydgraph
-from pydgraph import run_transaction_async
+from pydgraph import AsyncDgraphClient, AsyncDgraphClientStub, run_transaction_async
 from pydgraph.proto import api_pb2 as api
 
-from .helpers import generate_movie
+from .helpers import TEST_SERVER_ADDR, generate_movie
 
 if TYPE_CHECKING:
     from pytest_benchmark.fixture import BenchmarkFixture
 
 
+# =============================================================================
+# Fixtures
+# =============================================================================
+
+
+@pytest.fixture
+def event_loop() -> Generator[asyncio.AbstractEventLoop, None, None]:
+    """Dedicated event loop for async benchmark tests."""
+    loop = asyncio.new_event_loop()
+    asyncio.set_event_loop(loop)
+    yield loop
+    loop.close()
+
+
+@pytest.fixture
+def benchmark_client(
+    event_loop: asyncio.AbstractEventLoop,
+    movies_schema_content: str,
+) -> Generator[AsyncDgraphClient, None, None]:
+    """Async client with schema for benchmark tests."""
+    loop = event_loop
+
+    async def setup() -> AsyncDgraphClient:
+        client_stub = AsyncDgraphClientStub(TEST_SERVER_ADDR)
+        client = AsyncDgraphClient(client_stub)
+        for _ in range(30):
+            try:
+                await client.login("groot", "password")
+                break
+            except Exception as e:
+                if "user not found" in str(e):
+                    raise
+                await asyncio.sleep(0.1)
+        await client.alter(pydgraph.Operation(drop_all=True))
+        await client.alter(pydgraph.Operation(schema=movies_schema_content))
+        return client
+
+    client = loop.run_until_complete(setup())
+    yield client
+    loop.run_until_complete(client.close())
+
+
 # =============================================================================
 # Query Benchmarks
 # =============================================================================
@@ -38,11 +84,13 @@ class TestAsyncQueryBenchmarks:
 
     def test_benchmark_query_async(
         self,
-        stress_test_async_client_for_benchmark,
+        event_loop: asyncio.AbstractEventLoop,
+        benchmark_client: AsyncDgraphClient,
         benchmark: BenchmarkFixture,
     ) -> None:
         """Benchmark a simple async read query."""
-        client, loop = stress_test_async_client_for_benchmark
+        loop = event_loop
+        client = benchmark_client
 
         # Setup: seed data outside benchmark
         async def setup() -> None:
@@ -70,11 +118,13 @@ def benchmark_wrapper() -> api.Response:
 
     def test_benchmark_query_with_vars_async(
         self,
-        stress_test_async_client_for_benchmark,
+        event_loop: asyncio.AbstractEventLoop,
+        benchmark_client: AsyncDgraphClient,
         benchmark: BenchmarkFixture,
     ) -> None:
         """Benchmark an async query with variables."""
-        client, loop = stress_test_async_client_for_benchmark
+        loop = event_loop
+        client = benchmark_client
 
         # Setup
         async def setup() -> None:
@@ -104,11 +154,13 @@ def benchmark_wrapper() -> api.Response:
 
     def test_benchmark_query_best_effort_async(
         self,
-        stress_test_async_client_for_benchmark,
+        event_loop: asyncio.AbstractEventLoop,
+        benchmark_client: AsyncDgraphClient,
         benchmark: BenchmarkFixture,
     ) -> None:
         """Benchmark a best-effort async read query."""
-        client, loop = stress_test_async_client_for_benchmark
+        loop = event_loop
+        client = benchmark_client
 
         # Setup
         async def setup() -> None:
@@ -139,11 +191,13 @@ class TestAsyncMutationBenchmarks:
 
     def test_benchmark_mutation_commit_now_async(
         self,
-        stress_test_async_client_for_benchmark,
+        event_loop: asyncio.AbstractEventLoop,
+        benchmark_client: AsyncDgraphClient,
         benchmark: BenchmarkFixture,
     ) -> None:
         """Benchmark async mutation with commit_now."""
-        client, loop = stress_test_async_client_for_benchmark
+        loop = event_loop
+        client = benchmark_client
         counter = [0]
 
         async def run_mutation() -> api.Response:
@@ -158,11 +212,13 @@ def benchmark_wrapper() -> api.Response:
 
     def test_benchmark_mutation_explicit_commit_async(
         self,
-        stress_test_async_client_for_benchmark,
+        event_loop: asyncio.AbstractEventLoop,
+        benchmark_client: AsyncDgraphClient,
         benchmark: BenchmarkFixture,
     ) -> None:
         """Benchmark async mutation with explicit commit."""
-        client, loop = stress_test_async_client_for_benchmark
+        loop = event_loop
+        client = benchmark_client
         counter = [0]
 
         async def run_mutation() -> api.TxnContext | None:
@@ -178,11 +234,13 @@ def benchmark_wrapper() -> api.TxnContext | None:
 
     def test_benchmark_discard_async(
         self,
-        stress_test_async_client_for_benchmark,
+        event_loop: asyncio.AbstractEventLoop,
+        benchmark_client: AsyncDgraphClient,
         benchmark: BenchmarkFixture,
     ) -> None:
         """Benchmark async mutation followed by discard."""
-        client, loop = stress_test_async_client_for_benchmark
+        loop = event_loop
+        client = benchmark_client
         counter = [0]
 
         async def run_mutation() -> None:
@@ -198,11 +256,13 @@ def benchmark_wrapper() -> None:
 
     def test_benchmark_mutation_nquads_async(
         self,
-        stress_test_async_client_for_benchmark,
+        event_loop: asyncio.AbstractEventLoop,
+        benchmark_client: AsyncDgraphClient,
         benchmark: BenchmarkFixture,
     ) -> None:
         """Benchmark async N-Quads mutation."""
-        client, loop = stress_test_async_client_for_benchmark
+        loop = event_loop
+        client = benchmark_client
         counter = [0]
 
         async def run_mutation() -> api.Response:
@@ -222,11 +282,13 @@ def benchmark_wrapper() -> api.Response:
 
     def test_benchmark_delete_async(
         self,
-        stress_test_async_client_for_benchmark,
+        event_loop: asyncio.AbstractEventLoop,
+        benchmark_client: AsyncDgraphClient,
         benchmark: BenchmarkFixture,
     ) -> None:
         """Benchmark async delete mutation."""
-        client, loop = stress_test_async_client_for_benchmark
+        loop = event_loop
+        client = benchmark_client
 
         # Pre-create nodes to delete
         async def setup() -> list[str]:
@@ -262,11 +324,13 @@ class TestAsyncTransactionBenchmarks:
 
     def test_benchmark_upsert_async(
         self,
-        stress_test_async_client_for_benchmark,
+        event_loop: asyncio.AbstractEventLoop,
+        benchmark_client: AsyncDgraphClient,
         benchmark: BenchmarkFixture,
     ) -> None:
         """Benchmark async upsert operation."""
-        client, loop = stress_test_async_client_for_benchmark
+        loop = event_loop
+        client = benchmark_client
         counter = [0]
 
         async def run_upsert() -> api.Response:
@@ -295,11 +359,13 @@ def benchmark_wrapper() -> api.Response:
 
     def test_benchmark_batch_mutations_async(
         self,
-        stress_test_async_client_for_benchmark,
+        event_loop: asyncio.AbstractEventLoop,
+        benchmark_client: AsyncDgraphClient,
         benchmark: BenchmarkFixture,
     ) -> None:
         """Benchmark multiple async mutations in one transaction."""
-        client, loop = stress_test_async_client_for_benchmark
+        loop = event_loop
+        client = benchmark_client
         counter = [0]
         batch_size = 10
 
@@ -317,11 +383,13 @@ def benchmark_wrapper() -> api.TxnContext | None:
 
     def test_benchmark_run_transaction_async(
         self,
-        stress_test_async_client_for_benchmark,
+        event_loop: asyncio.AbstractEventLoop,
+        benchmark_client: AsyncDgraphClient,
         benchmark: BenchmarkFixture,
     ) -> None:
         """Benchmark run_transaction_async helper overhead."""
-        client, loop = stress_test_async_client_for_benchmark
+        loop = event_loop
+        client = benchmark_client
         counter = [0]
 
         async def txn_func(txn: pydgraph.AsyncTxn) -> str:
@@ -350,11 +418,13 @@ class TestAsyncClientBenchmarks:
 
     def test_benchmark_check_version_async(
         self,
-        stress_test_async_client_for_benchmark,
+        event_loop: asyncio.AbstractEventLoop,
+        benchmark_client: AsyncDgraphClient,
         benchmark: BenchmarkFixture,
     ) -> None:
         """Benchmark async check_version."""
-        client, loop = stress_test_async_client_for_benchmark
+        loop = event_loop
+        client = benchmark_client
 
         async def run_check() -> str:
             return await client.check_version()
@@ -366,11 +436,13 @@ def benchmark_wrapper() -> str:
 
     def test_benchmark_alter_schema_async(
         self,
-        stress_test_async_client_for_benchmark,
+        event_loop: asyncio.AbstractEventLoop,
+        benchmark_client: AsyncDgraphClient,
         benchmark: BenchmarkFixture,
     ) -> None:
         """Benchmark async schema alter operation."""
-        client, loop = stress_test_async_client_for_benchmark
+        loop = event_loop
+        client = benchmark_client
         counter = [0]
 
         async def run_alter() -> api.Payload: