mirror of
https://github.com/logos-blockchain/logos-blockchain-e2e-tests.git
synced 2026-01-03 13:43:11 +00:00
fix: optimize setup fixtures
This commit is contained in:
parent
1b0731f2ad
commit
5f68514156
@ -19,6 +19,16 @@ def prepare_cluster_config(node_count):
|
||||
shutil.copyfile(src, dst)
|
||||
|
||||
|
||||
def start_nodes(nodes):
|
||||
for node in nodes:
|
||||
node.start()
|
||||
|
||||
|
||||
def ensure_nodes_ready(nodes):
|
||||
for node in nodes:
|
||||
node.ensure_ready()
|
||||
|
||||
|
||||
class StepsCommon:
|
||||
@pytest.fixture(scope="function", autouse=True)
|
||||
def cluster_setup(self):
|
||||
@ -32,14 +42,11 @@ class StepsCommon:
|
||||
self.node1 = NomosNode(CFGSYNC, "cfgsync")
|
||||
self.node2 = NomosNode(NOMOS, "nomos_node_0")
|
||||
self.node3 = NomosNode(NOMOS_EXECUTOR, "nomos_node_1")
|
||||
self.node1.start()
|
||||
self.node2.start()
|
||||
self.node3.start()
|
||||
self.main_nodes.extend([self.node1, self.node2, self.node3])
|
||||
start_nodes(self.main_nodes)
|
||||
|
||||
try:
|
||||
self.node2.ensure_ready()
|
||||
self.node3.ensure_ready()
|
||||
ensure_nodes_ready(self.main_nodes[2:])
|
||||
except Exception as ex:
|
||||
logger.error(f"REST service did not become ready in time: {ex}")
|
||||
raise
|
||||
@ -54,20 +61,11 @@ class StepsCommon:
|
||||
self.node4 = NomosNode(NOMOS, "nomos_node_2")
|
||||
self.node5 = NomosNode(NOMOS, "nomos_node_3")
|
||||
self.node6 = NomosNode(NOMOS_EXECUTOR, "nomos_node_4")
|
||||
self.node1.start()
|
||||
self.node2.start()
|
||||
self.node3.start()
|
||||
self.node4.start()
|
||||
self.node5.start()
|
||||
self.node6.start()
|
||||
self.main_nodes.extend([self.node1, self.node2, self.node3, self.node4, self.node5, self.node6])
|
||||
start_nodes(self.main_nodes)
|
||||
|
||||
try:
|
||||
self.node2.ensure_ready()
|
||||
self.node3.ensure_ready()
|
||||
self.node4.ensure_ready()
|
||||
self.node5.ensure_ready()
|
||||
self.node6.ensure_ready()
|
||||
ensure_nodes_ready(self.main_nodes[2:])
|
||||
except Exception as ex:
|
||||
logger.error(f"REST service did not become ready in time: {ex}")
|
||||
raise
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user