From f265d6ae18f9ff88348208c769d780daf9c6eab7 Mon Sep 17 00:00:00 2001 From: Alexander Presnyakov Date: Wed, 9 Jul 2025 01:47:01 +0000 Subject: [PATCH] Fix test --- cmapi/cmapi_server/handlers/cluster.py | 6 ++++-- cmapi/cmapi_server/helpers.py | 4 ++++ cmapi/cmapi_server/test/test_node_manip.py | 1 - 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/cmapi/cmapi_server/handlers/cluster.py b/cmapi/cmapi_server/handlers/cluster.py index dc2b9a235..0dea27c1a 100644 --- a/cmapi/cmapi_server/handlers/cluster.py +++ b/cmapi/cmapi_server/handlers/cluster.py @@ -224,14 +224,16 @@ class ClusterHandler(): node, input_config_filename=config, output_config_filename=config ) - with NodeConfig().modify_config(config) as root: - update_dbroots_of_readonly_nodes(root) + except Exception as err: raise CMAPIBasicError('Error while removing node.') from err response['node_id'] = node active_nodes = get_active_nodes(config) if len(active_nodes) > 0: + with NodeConfig().modify_config(config) as root: + update_dbroots_of_readonly_nodes(root) + update_revision_and_manager( input_config_filename=config, output_config_filename=config ) diff --git a/cmapi/cmapi_server/helpers.py b/cmapi/cmapi_server/helpers.py index 1e707cb29..08019bcef 100644 --- a/cmapi/cmapi_server/helpers.py +++ b/cmapi/cmapi_server/helpers.py @@ -135,6 +135,10 @@ def start_transaction( # this copy will be updated if an optional node can't be reached real_active_nodes = set(active_nodes) logging.trace(f'Active nodes on start transaction {active_nodes}') + + if not len(active_nodes): + logging.warning('No active nodes found, transaction start will not have any effect') + for node in active_nodes: url = f'https://{node}:8640/cmapi/{version}/node/begin' node_success = False diff --git a/cmapi/cmapi_server/test/test_node_manip.py b/cmapi/cmapi_server/test/test_node_manip.py index bebc709d2..924923d46 100644 --- a/cmapi/cmapi_server/test/test_node_manip.py +++ b/cmapi/cmapi_server/test/test_node_manip.py @@ -16,7 +16,6 @@ logging.basicConfig(level='DEBUG') SINGLE_NODE_XML = "./cmapi_server/SingleNode.xml" -@unittest.skip('Temp skip for testing reason') class NodeManipTester(BaseNodeManipTestCase): def test_add_remove_node(self):