Address Copilot comments (3)

Signed-off-by: Sergio Herrera <627709+seherv@users.noreply.github.com>

Author: seherv

tests/integration/conftest.py

@@ -2,8 +2,9 @@
 import subprocess
 import tempfile
 import time
+from contextlib import contextmanager
 from pathlib import Path
-from typing import Any, Generator
+from typing import Any, Generator, Iterator
 
 import pytest
 
@@ -113,6 +114,17 @@ def cleanup(self) -> None:
         self._log_files.clear()
 
 
+@contextmanager
+def _preserve_http_port() -> Iterator[None]:
+    # start_sidecar() mutates settings.DAPR_HTTP_PORT.
+    # This restores the original value so it does not leak across test modules.
+    original = settings.DAPR_HTTP_PORT
+    try:
+        yield
+    finally:
+        settings.DAPR_HTTP_PORT = original
+
+
 @pytest.fixture(scope='module')
 def dapr_env() -> Generator[DaprTestEnvironment, Any, None]:
     """Provides a DaprTestEnvironment for programmatic SDK testing.
@@ -121,9 +133,12 @@ def dapr_env() -> Generator[DaprTestEnvironment, Any, None]:
     avoiding port conflicts from rapid start/stop cycles and cutting total
     test time significantly.
     """
-    env = DaprTestEnvironment()
-    yield env
-    env.cleanup()
+    with _preserve_http_port():
+        env = DaprTestEnvironment()
+        try:
+            yield env
+        finally:
+            env.cleanup()
 
 
 @pytest.fixture(scope='module')

tests/integration/test_configuration.py

@@ -19,6 +19,7 @@ def _redis_set(key: str, value: str, version: int = 1) -> None:
         args=('docker', 'exec', REDIS_CONTAINER, 'redis-cli', 'SET', key, f'{value}||{version}'),
         check=True,
         capture_output=True,
+        timeout=10,
     )
 
 

tests/integration/test_pubsub.py

@@ -23,6 +23,7 @@ def _flush_redis() -> None:
         args=('docker', 'exec', REDIS_CONTAINER, 'redis-cli', 'FLUSHDB'),
         check=True,
         capture_output=True,
+        timeout=10,
     )
 
 

tox.ini

@@ -51,7 +51,7 @@ commands =
 allowlist_externals=*
 
 commands_pre =
-    pip uninstall -y dapr dapr-ext-grpc dapr-ext-fastapi dapr-ext-langgraph dapr-ext-strands dapr-ext-flask dapr-ext-langgraph dapr-ext-strands
+    pip uninstall -y dapr dapr-ext-grpc dapr-ext-fastapi dapr-ext-langgraph dapr-ext-strands dapr-ext-flask
     pip install -r {toxinidir}/dev-requirements.txt \
                 -e {toxinidir}/ \
                 -e {toxinidir}/ext/dapr-ext-workflow/ \