From bb1b08d8381eaef6aa60609201d4faf2b1375c14 Mon Sep 17 00:00:00 2001 From: NagyZoltanPeter <113987313+NagyZoltanPeter@users.noreply.github.com> Date: Tue, 17 Mar 2026 18:53:45 +0100 Subject: [PATCH] Fix auto and static sharding subscribe/unsubscribe tests - use a safe un-used cluster-id ever (cluster id 2 is now defaults to logos.dev with its settings), also adapted static sharding unsubscribe to PR#3732 --- src/steps/sharding.py | 2 +- src/test_data.py | 2 +- tests/sharding/test_relay_static_sharding.py | 9 +-------- 3 files changed, 3 insertions(+), 10 deletions(-) diff --git a/src/steps/sharding.py b/src/steps/sharding.py index 5086a57f0..96be02f49 100644 --- a/src/steps/sharding.py +++ b/src/steps/sharding.py @@ -22,7 +22,7 @@ class StepsSharding(StepsRelay): test_content_topic = "/myapp/1/latest/proto" test_pubsub_topic = "/waku/2/rs/2/0" test_payload = "Sharding works!!" - auto_cluster = 2 + auto_cluster = 199 num_shards_in_network = 8 @pytest.fixture(scope="function", autouse=True) diff --git a/src/test_data.py b/src/test_data.py index 02ad8c2fc..866dda8df 100644 --- a/src/test_data.py +++ b/src/test_data.py @@ -96,7 +96,7 @@ CONTENT_TOPICS_SHARD_7 = [ "/newsService/4.0/updates/yaml", ] -DEFAULT_CLUSTER_ID = "3" +DEFAULT_CLUSTER_ID = "198" VALID_PUBSUB_TOPICS = [ f"/waku/2/rs/{DEFAULT_CLUSTER_ID}/0", f"/waku/2/rs/{DEFAULT_CLUSTER_ID}/1", diff --git a/tests/sharding/test_relay_static_sharding.py b/tests/sharding/test_relay_static_sharding.py index 07e632d72..aef848819 100644 --- a/tests/sharding/test_relay_static_sharding.py +++ b/tests/sharding/test_relay_static_sharding.py @@ -96,14 +96,7 @@ class TestRelayStaticSharding(StepsSharding): def test_unsubscribe_from_non_subscribed_pubsub_topics(self): self.setup_main_relay_nodes(cluster_id=self.auto_cluster, pubsub_topic=self.test_pubsub_topic) - try: - self.unsubscribe_main_relay_nodes(pubsub_topics=PUBSUB_TOPICS_SAME_CLUSTER) - if self.node1.is_nwaku(): - pass - else: - raise AssertionError("Unsubscribe from non-subscribed pubsub_topic worked!!!") - except Exception as ex: - assert "Bad Request" in str(ex) or "Internal Server Error" in str(ex) + self.unsubscribe_main_relay_nodes(pubsub_topics=PUBSUB_TOPICS_SAME_CLUSTER) for pubsub_topic in PUBSUB_TOPICS_SAME_CLUSTER: self.check_publish_fails_on_not_subscribed_pubsub_topic(pubsub_topic)