Address Copilot comments (2)

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

Author: seherv

tests/integration/apps/pubsub_subscriber.py

@@ -17,8 +17,9 @@
 @app.subscribe(pubsub_name='pubsub', topic='TOPIC_A')
 def handle_topic_a(event: v1.Event) -> TopicEventResponse:
     data = json.loads(event.Data())
+    key = f'received-{data["run_id"]}-{data["id"]}'
     with DaprClient() as d:
-        d.save_state('statestore', f'received-topic-a-{data["id"]}', event.Data())
+        d.save_state('statestore', key, event.Data())
     return TopicEventResponse('success')
 
 

tests/integration/test_configuration.py

@@ -16,7 +16,7 @@ def _redis_set(key: str, value: str, version: int = 1) -> None:
     Dapr's Redis configuration store encodes values as ``value||version``.
     """
     subprocess.run(
-        args=('docker', 'exec', REDIS_CONTAINER, 'redis-cli', 'SET', key, f'"{value}||{version}"'),
+        args=('docker', 'exec', REDIS_CONTAINER, 'redis-cli', 'SET', key, f'{value}||{version}'),
         check=True,
         capture_output=True,
     )

tests/integration/test_pubsub.py

@@ -1,15 +1,34 @@
 import json
+import subprocess
 import time
+import uuid
 
 import pytest
 
 STORE = 'statestore'
 PUBSUB = 'pubsub'
 TOPIC = 'TOPIC_A'
+REDIS_CONTAINER = 'dapr_redis'
+
+
+def _flush_redis() -> None:
+    """Flush the Dapr Redis instance to prevent state leaking between runs.
+
+    Both the state store and the pubsub component point at the same
+    ``dapr_redis`` container (see ``tests/integration/components/``), so a
+    previous run's ``received-*`` keys could otherwise satisfy this test's
+    assertions even if no new message was delivered.
+    """
+    subprocess.run(
+        args=('docker', 'exec', REDIS_CONTAINER, 'redis-cli', 'FLUSHDB'),
+        check=True,
+        capture_output=True,
+    )
 
 
 @pytest.fixture(scope='module')
 def client(dapr_env, apps_dir):
+    _flush_redis()
     return dapr_env.start_sidecar(
         app_id='test-subscriber',
         grpc_port=50001,
@@ -20,19 +39,20 @@ def client(dapr_env, apps_dir):
 
 
 def test_published_messages_are_received_by_subscriber(client):
+    run_id = uuid.uuid4().hex
     for n in range(1, 4):
         client.publish_event(
             pubsub_name=PUBSUB,
             topic_name=TOPIC,
-            data=json.dumps({'id': n, 'message': 'hello world'}),
+            data=json.dumps({'run_id': run_id, 'id': n, 'message': 'hello world'}),
             data_content_type='application/json',
         )
         time.sleep(1)
 
     time.sleep(3)
 
     for n in range(1, 4):
-        state = client.get_state(store_name=STORE, key=f'received-topic-a-{n}')
+        state = client.get_state(store_name=STORE, key=f'received-{run_id}-{n}')
         assert state.data != b'', f'Subscriber did not receive message {n}'
         msg = json.loads(state.data)
         assert msg['id'] == n
@@ -44,6 +64,6 @@ def test_publish_event_succeeds(client):
     client.publish_event(
         pubsub_name=PUBSUB,
         topic_name=TOPIC,
-        data=json.dumps({'id': 99, 'message': 'smoke test'}),
+        data=json.dumps({'run_id': uuid.uuid4().hex, 'id': 99, 'message': 'smoke test'}),
         data_content_type='application/json',
     )