Skip to content

Commit 3918e31

Browse files
committed
Dev: unittests: Adjust unit test for previous commit
1 parent 5bc3ed7 commit 3918e31

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

test/unittests/test_sbd.py

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -718,14 +718,16 @@ def test_update_configuration_return(self, mock_ServiceManager, mock_sysconfig_s
718718
sbdmanager_instance.update_configuration()
719719
mock_sysconfig_set.assert_not_called()
720720

721+
@patch('crmsh.utils.list_cluster_nodes_except_me')
721722
@patch('crmsh.bootstrap.sync_path')
722723
@patch('crmsh.utils.sysconfig_set')
723724
@patch('logging.Logger.info')
724725
@patch('crmsh.utils.copy_local_file')
725726
@patch('crmsh.sbd.ServiceManager')
726-
def test_update_configuration(self, mock_ServiceManager, mock_copy_local_file, mock_logger_info, mock_sysconfig_set, mock_sync_file):
727+
def test_update_configuration(self, mock_ServiceManager, mock_copy_local_file, mock_logger_info, mock_sysconfig_set, mock_sync_file, mock_list_cluster_nodes_except_me):
727728
sbdmanager_instance = SBDManager(update_dict={'key': 'value'})
728729
sbdmanager_instance.overwrite_sysconfig = True
730+
mock_list_cluster_nodes_except_me.return_value = ['node1', 'node2']
729731
sbdmanager_instance.update_configuration()
730732
mock_logger_info.assert_has_calls([
731733
call("Update %s in %s: %s", 'key', sbd.SBDManager.SYSCONFIG_SBD, 'value'),
@@ -808,6 +810,7 @@ def test_cleanup_existing_sbd_resource(self, mock_CrmMonXmlParser, mock_logger_i
808810
call("Remove sbd resource '%s'", 'sbd_resource')
809811
])
810812

813+
@patch('crmsh.utils.list_cluster_nodes_except_me')
811814
@patch('crmsh.parallax.parallax_call')
812815
@patch('crmsh.utils.cleanup_stonith_related_properties')
813816
@patch('crmsh.sbd.sh.cluster_shell')
@@ -816,8 +819,9 @@ def test_cleanup_existing_sbd_resource(self, mock_CrmMonXmlParser, mock_logger_i
816819
@patch('crmsh.sbd.ServiceManager')
817820
@patch('crmsh.utils.list_cluster_nodes')
818821
@patch('crmsh.sbd.cleanup_existing_sbd_resource')
819-
def test_purge_sbd_from_cluster(self, mock_cleanup_existing_sbd_resource, mock_list_cluster_nodes, mock_ServiceManager, mock_logger_info, mock_cluster_run_cmd, mock_cluster_shell, mock_cleanup_stonith_related_properties, mock_parallax_call):
822+
def test_purge_sbd_from_cluster(self, mock_cleanup_existing_sbd_resource, mock_list_cluster_nodes, mock_ServiceManager, mock_logger_info, mock_cluster_run_cmd, mock_cluster_shell, mock_cleanup_stonith_related_properties, mock_parallax_call, mock_list_cluster_nodes_except_me):
820823
mock_list_cluster_nodes.return_value = ['node1', 'node2']
824+
mock_list_cluster_nodes_except_me.return_value = ['node2']
821825
mock_ServiceManager.return_value.service_is_enabled.side_effect = [True, True]
822826
stonith_data = """stonith-sbd
823827
1 fence device found
@@ -827,6 +831,6 @@ def test_purge_sbd_from_cluster(self, mock_cleanup_existing_sbd_resource, mock_l
827831
mock_logger_info.assert_has_calls([
828832
call("Disable %s on node %s", constants.SBD_SERVICE, 'node1'),
829833
call("Disable %s on node %s", constants.SBD_SERVICE, 'node2'),
830-
call("Move %s to %s on all nodes", sbd.SBDManager.SYSCONFIG_SBD, sbd.SBDManager.SYSCONFIG_SBD+'.bak')
834+
call("Move %s to %s%s", sbd.SBDManager.SYSCONFIG_SBD, sbd.SBDManager.SYSCONFIG_SBD+'.bak', ' on all nodes')
831835
])
832836
mock_cleanup_stonith_related_properties.assert_called_once()

0 commit comments

Comments
 (0)