From 7ff4f4a19d050edb68923498e634c05f4c5da6f1 Mon Sep 17 00:00:00 2001 From: Roman Date: Mon, 13 Jan 2025 16:07:13 +0800 Subject: [PATCH] fix: ensure ready after all nodes have started --- src/node/nomos_node.py | 6 ------ tests/e2e/test_2node_alive.py | 11 +++++++++++ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/src/node/nomos_node.py b/src/node/nomos_node.py index 205c8fd..912acfa 100644 --- a/src/node/nomos_node.py +++ b/src/node/nomos_node.py @@ -81,12 +81,6 @@ class NomosNode: logger.debug(f"Container returned {self._container}") logger.debug(f"Started container from image {self._image_name}. " f"REST: {getattr(self, '_tcp_port', 'N/A')}") - # try: - # self.ensure_ready(timeout_duration=wait_for_node_sec) - # except Exception as ex: - # logger.error(f"REST service did not become ready in time: {ex}") - # raise - def ensure_ready(self, timeout_duration=10): @retry(stop=stop_after_delay(timeout_duration), wait=wait_fixed(0.1), reraise=True) def check_ready(node=self): diff --git a/tests/e2e/test_2node_alive.py b/tests/e2e/test_2node_alive.py index 43f1d55..f086fb7 100644 --- a/tests/e2e/test_2node_alive.py +++ b/tests/e2e/test_2node_alive.py @@ -1,7 +1,10 @@ from src.env_vars import CFGSYNC, NOMOS, NOMOS_EXECUTOR +from src.libs.custom_logger import get_custom_logger from src.node.nomos_node import NomosNode from src.libs.common import delay +logger = get_custom_logger(__name__) + class Test2NodeClAlive: def test_cluster_start(self): @@ -14,4 +17,12 @@ class Test2NodeClAlive: self.node2.start() self.node3.start() + self.node1.ensure_ready() + try: + self.node2.ensure_ready() + self.node3.ensure_ready() + except Exception as ex: + logger.error(f"REST service did not become ready in time: {ex}") + raise + delay(60)