small improvements

src/node/waku_node.py

@@ -16,12 +16,18 @@ class WakuNode:
         self._log_path = os.path.join(LOG_DIR, f"{docker_log_prefix}__{self._image_name.replace('/', '_')}.log")
         self._docker_manager = DockerManager(self._image_name)
         self._container = None
+        logger.debug("WakuNode instance initialized with log path %s", self._log_path)
+
+    @retry(stop=stop_after_delay(5), wait=wait_fixed(0.1), reraise=True)
+    def start(self, **kwargs):
+        logger.debug("Starting Node...")
+        self._docker_manager.create_network()
         self._ext_ip = self._docker_manager.generate_random_ext_ip()
         self._ports = self._docker_manager.generate_ports()
         self._rest_port = self._ports[0]
         self._rpc_port = self._ports[1]
         self._websocket_port = self._ports[2]
-        logger.debug("WakuNode instance initialized with log path %s", self._log_path)
+
         if PROTOCOL == "RPC":
             self._api = RPC(self._rpc_port, self._image_name)
         elif PROTOCOL == "REST":
@@ -29,11 +35,6 @@ class WakuNode:
         else:
             raise ValueError(f"Unknown protocol: {PROTOCOL}")
 
-    @retry(stop=stop_after_delay(5), wait=wait_fixed(0.1), reraise=True)
-    def start(self, **kwargs):
-        logger.debug("Starting Node...")
-        self._docker_manager.create_network()
-
         default_args = {
             "listen-address": "0.0.0.0",
             "rpc": "true",

src/steps/relay.py

@@ -26,6 +26,10 @@ class StepsRelay:
 
     @allure.step
     @retry(stop=stop_after_delay(20), wait=wait_fixed(0.5), reraise=True)
+    def check_published_message_reaches_peer_with_retry(self, message):
+        self.check_published_message_reaches_peer(message)
+
+    @allure.step
     def check_published_message_reaches_peer(self, message):
         message.timestamp = int(time() * 1e9)
         self.node1.send_message(message, self.test_pubsub_topic)

tests/relay/test_publish.py

@@ -11,23 +11,34 @@ logger = logging.getLogger(__name__)
 class TestRelayPublish(StepsRelay):
     def test_publish_with_various_payloads(self):
         failed_payloads = []
-        for payload in SAMPLE_INPUTS:
+        for index, payload in enumerate(SAMPLE_INPUTS):
             logger.debug("Running test with payload %s", payload["description"])
             message = MessageRpcQuery(payload=to_base64(payload["value"]), contentTopic=self.test_content_topic)
             try:
-                self.check_published_message_reaches_peer(message)
+                # The node may require a warmup period for message processing to stabilize.
+                # Therefore, we use the retry function for the first payload to account for this warmup.
+                if index == 0:
+                    self.check_published_message_reaches_peer_with_retry(message)
+                else:
+                    self.check_published_message_reaches_peer(message)
             except Exception as e:
-                logger.error("Payload %s failed: %s", {payload["description"]}, {str(e)})
+                logger.error("Payload %s failed: %s", payload["description"], str(e))
-                failed_payloads.append(payload)
+                failed_payloads.append(payload["description"])
+
         assert not failed_payloads, f"Payloads failed: {failed_payloads}"
 
     def test_publish_with_various_content_topics(self):
         failed_content_topics = []
-        for content_topic in SAMPLE_INPUTS:
+        for index, content_topic in enumerate(SAMPLE_INPUTS):
             logger.debug("Running test with content topic %s", content_topic["description"])
             message = MessageRpcQuery(payload=to_base64(self.test_payload), contentTopic=content_topic["value"])
             try:
-                self.check_published_message_reaches_peer(message)
+                # The node may require a warmup period for message processing to stabilize.
+                # Therefore, we use the retry function for the first payload to account for this warmup.
+                if index == 0:
+                    self.check_published_message_reaches_peer_with_retry(message)
+                else:
+                    self.check_published_message_reaches_peer(message)
             except Exception as e:
                 logger.error("ContentTopic %s failed: %s", {content_topic["description"]}, {str(e)})
                 failed_content_topics.append(content_topic)