diff --git a/src/steps/filter.py b/src/steps/filter.py index 211ba4a0..6cfdb2a7 100644 --- a/src/steps/filter.py +++ b/src/steps/filter.py @@ -183,7 +183,7 @@ class StepsFilter: self.ping_filter_subscriptions(str(uuid4()), node=node) raise AssertionError("Ping without any subscription worked") except Exception as ex: - assert "peer has no subscriptions" in str(ex) + assert "peer has no subscription" in str(ex) @allure.step def add_new_relay_subscription(self, pubsub_topics, node=None): diff --git a/tests/filter/test_get_messages.py b/tests/filter/test_get_messages.py index c9962e3b..18485332 100644 --- a/tests/filter/test_get_messages.py +++ b/tests/filter/test_get_messages.py @@ -119,7 +119,7 @@ class TestFilterGetMessages(StepsFilter): f"M_{index}" ), f'Incorrect payload at index: {index}. Published {to_base64(f"M_{index}")} Received {message["payload"]}' - def test_filter_get_message_with_1MB_payload(self): - payload_length = 1024 * 1023 + def test_filter_get_message_with_150_kb_payload(self): + payload_length = 1024 * 100 # after encoding to base64 this will be close to 150KB message = self.create_message(payload=to_base64("a" * (payload_length))) self.check_published_message_reaches_filter_peer(message, message_propagation_delay=2) diff --git a/tests/filter/test_multiple_nodes.py b/tests/filter/test_multiple_nodes.py index e4edbe13..dbbd3fca 100644 --- a/tests/filter/test_multiple_nodes.py +++ b/tests/filter/test_multiple_nodes.py @@ -1,4 +1,5 @@ import pytest +from src.libs.common import delay from src.libs.custom_logger import get_custom_logger from src.steps.filter import StepsFilter @@ -31,6 +32,7 @@ class TestFilterMultipleNodes(StepsFilter): self.node1.send_relay_message(relay_message1, self.test_pubsub_topic) self.node2.unpause() self.node1.send_relay_message(relay_message2, self.test_pubsub_topic) + delay(0.5) filter_messages = self.get_filter_messages(content_topic=self.test_content_topic, pubsub_topic=self.test_pubsub_topic, node=self.node2) assert len(filter_messages) == 2, "Both messages should've been returned" diff --git a/tests/relay/test_publish.py b/tests/relay/test_publish.py index d37b13e1..19765df1 100644 --- a/tests/relay/test_publish.py +++ b/tests/relay/test_publish.py @@ -43,14 +43,14 @@ class TestRelayPublish(StepsRelay): except Exception as ex: assert "Bad Request" in str(ex) or "Internal Server Error" in str(ex) - def test_publish_with_payload_less_than_one_mb(self): - payload_length = 1024 * 700 # after encoding to base64 this be close to 1MB + def test_publish_with_payload_less_than_one_150_kb(self): + payload_length = 1024 * 100 # after encoding to base64 this will be close to 150KB logger.debug(f"Running test with payload length of {payload_length} bytes") message = self.create_message(payload=to_base64("a" * (payload_length))) self.check_published_message_reaches_relay_peer(message, message_propagation_delay=2) - def test_publish_with_payload_equal_or_more_than_one_mb(self): - for payload_length in [1024 * 1024, 1024 * 1024 * 10]: + def test_publish_with_payload_equal_or_more_150_kb(self): + for payload_length in [1024 * 200, 1024 * 1024, 1024 * 1024 * 10]: logger.debug(f"Running test with payload length of {payload_length} bytes") message = self.create_message(payload=to_base64("a" * (payload_length))) try: @@ -226,6 +226,7 @@ class TestRelayPublish(StepsRelay): self.node2.unpause() self.check_published_message_reaches_relay_peer(self.create_message(payload=to_base64("M2"))) + @pytest.mark.flaky(reruns=5) def test_publish_after_node1_restarts(self): self.check_published_message_reaches_relay_peer() self.node1.restart()