Dev: unittests: Adjust unit test for previous commit

Author: liangxin1300

test/unittests/test_bootstrap.py

@@ -1964,16 +1964,17 @@ def test_remove_self_other_nodes(self, mock_this_node, mock_list, mock_run, mock
         mock_run.assert_called_once_with("node2", "crm cluster remove -y -c node1")
         mock_error.assert_called_once_with("Failed to remove this node from node2: err")
 
-    @mock.patch('crmsh.utils.package_is_installed')
+    @mock.patch('crmsh.sbd.cleanup_sbd_configurations')
+    @mock.patch('os.path.exists')
     @mock.patch('crmsh.sh.ClusterShell.get_stdout_or_raise_error')
-    def test_rm_configuration_files(self, mock_run, mock_installed):
+    def test_rm_configuration_files(self, mock_run, mock_exists, mock_rm_sbd):
         bootstrap._context = mock.Mock(rm_list=["file1", "file2"])
-        mock_installed.return_value = True
+        mock_exists.return_value = True
         bootstrap.rm_configuration_files()
         mock_run.assert_has_calls([
             mock.call('rm -f file1 file2', None),
-            mock.call('cp /usr/share/fillup-templates/sysconfig.sbd /etc/sysconfig/sbd', None)
             ])
+        mock_rm_sbd.assert_called_once_with(None)
 
     @mock.patch('crmsh.utils.get_iplist_from_name')
     @mock.patch('crmsh.corosync.get_values')

test/unittests/test_sbd.py

@@ -811,15 +811,27 @@ def test_cleanup_existing_sbd_resource(self, mock_CrmMonXmlParser, mock_logger_i
             call("Remove sbd resource '%s'", 'sbd_resource')
         ])
 
-    @patch('crmsh.parallax.parallax_call')
+    @patch('logging.Logger.info')
+    @patch('crmsh.sh.cluster_shell')
+    def test_cleanup_sbd_configurations(self, mock_cluster_shell, mock_logger_info):
+        mock_cluster_shell_inst = Mock()
+        mock_cluster_shell.return_value = mock_cluster_shell_inst
+        mock_cluster_shell_inst.get_stdout_or_raise_error = Mock()
+        sbd.cleanup_sbd_configurations()
+        mock_cluster_shell_inst.get_stdout_or_raise_error.assert_has_calls([
+            call(f"test -f {sbd.SBDManager.SYSCONFIG_SBD} && mv {sbd.SBDManager.SYSCONFIG_SBD} {sbd.SBDManager.SYSCONFIG_SBD}.bak || exit 0", host=None),
+            call(f"test -d {sbd.SBDManager.SBD_SYSTEMD_DELAY_START_DIR} && rm -rf {sbd.SBDManager.SBD_SYSTEMD_DELAY_START_DIR} && systemctl daemon-reload || exit 0", host=None),
+            call(f"test -d {sbd.SBDManager.SBD_SYSTEMD_DELAY_START_DISABLE_DIR} && rm -rf {sbd.SBDManager.SBD_SYSTEMD_DELAY_START_DISABLE_DIR} && systemctl daemon-reload || exit 0", host=None),
+        ])
+
+    @patch('crmsh.sbd.cleanup_sbd_configurations')
     @patch('crmsh.utils.cleanup_stonith_related_properties')
     @patch('crmsh.sbd.sh.cluster_shell')
-    @patch('crmsh.utils.cluster_run_cmd')
     @patch('logging.Logger.info')
     @patch('crmsh.sbd.ServiceManager')
     @patch('crmsh.utils.list_cluster_nodes')
     @patch('crmsh.sbd.cleanup_existing_sbd_resource')
-    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):
+    def test_purge_sbd_from_cluster(self, mock_cleanup_existing_sbd_resource, mock_list_cluster_nodes, mock_ServiceManager, mock_logger_info, mock_cluster_shell, mock_cleanup_stonith_related_properties, mock_rm_sbd_configuration_files):
         mock_list_cluster_nodes.return_value = ['node1', 'node2']
         mock_ServiceManager.return_value.service_is_enabled.side_effect = [True, True]
         stonith_data = """stonith-sbd
@@ -830,6 +842,6 @@ def test_purge_sbd_from_cluster(self, mock_cleanup_existing_sbd_resource, mock_l
         mock_logger_info.assert_has_calls([
             call("Disable %s on node %s", constants.SBD_SERVICE, 'node1'),
             call("Disable %s on node %s", constants.SBD_SERVICE, 'node2'),
-            call("Move %s to %s on all nodes", sbd.SBDManager.SYSCONFIG_SBD, sbd.SBDManager.SYSCONFIG_SBD+'.bak')
         ])
         mock_cleanup_stonith_related_properties.assert_called_once()
+        mock_rm_sbd_configuration_files.assert_has_calls([call("node1"), call("node2")])