Dev: unittests: Adjust unit test for previous commit

Author: liangxin1300

test/unittests/test_bootstrap.py

@@ -1539,12 +1539,15 @@ def test_adjust_pcmk_delay(self, mock_cib_inst, mock_run, mock_debug):
         bootstrap.adjust_pcmk_delay_max(False)
         mock_run.assert_called_once_with("crm resource param res_1 delete pcmk_delay_max")
 
-    @mock.patch('crmsh.sbd.SBDTimeout.adjust_sbd_timeout_related_cluster_configuration')
+    @mock.patch('crmsh.sbd.SBDTimeoutChecker')
     @mock.patch('crmsh.service_manager.ServiceManager.service_is_active')
-    def test_adjust_stonith_timeout_sbd(self, mock_is_active, mock_sbd_adjust_timeout):
+    def test_adjust_stonith_timeout_sbd(self, mock_is_active, mock_sbd_checker):
+        mock_sbd_checker_inst = mock.Mock()
+        mock_sbd_checker.return_value = mock_sbd_checker_inst
+        mock_sbd_checker_inst.check_and_fix = mock.Mock()
         mock_is_active.return_value = True
         bootstrap.adjust_stonith_timeout()
-        mock_sbd_adjust_timeout.assert_called_once_with()
+        mock_sbd_checker.assert_called_once_with(fix=True, warn=False, from_bootstrap=True)
 
     @mock.patch('crmsh.utils.set_property')
     @mock.patch('crmsh.bootstrap.get_stonith_timeout_generally_expected')

test/unittests/test_sbd.py

@@ -22,12 +22,6 @@ def test_get_sbd_device_metadata_success(self, mock_cluster_shell):
         expected = {'uuid': '1234-5678', 'watchdog': 5, 'msgwait': 10}
         self.assertEqual(result, expected)
 
-    @patch('crmsh.sh.cluster_shell')
-    def test_get_sbd_device_metadata_exception(self, mock_cluster_shell):
-        mock_cluster_shell.return_value.get_stdout_or_raise_error.side_effect = Exception
-        result = SBDUtils.get_sbd_device_metadata("/dev/sbd_device")
-        self.assertEqual(result, {})
-
     @patch('crmsh.sh.cluster_shell')
     def test_get_sbd_device_metadata_timeout_only(self, mock_cluster_shell):
         mock_cluster_shell.return_value.get_stdout_or_raise_error.return_value = self.TEST_DATA
@@ -186,19 +180,6 @@ class TestSBDTimeout(unittest.TestCase):
     """
     Unitary tests for crmsh.sbd.SBDTimeout
     """
-    @patch('crmsh.sbd.SBDUtils.get_sbd_device_metadata')
-    def test_get_sbd_msgwait_exception(self, mock_get_sbd_device_metadata):
-        mock_get_sbd_device_metadata.return_value = {}
-        with self.assertRaises(ValueError) as context:
-            sbd.SBDTimeout.get_sbd_msgwait("/dev/sbd_device")
-            self.assertTrue("Cannot get sbd msgwait for /dev/sbd_device" in str(context.exception))
-
-    @patch('crmsh.sbd.SBDUtils.get_sbd_device_metadata')
-    def test_get_sbd_msgwait(self, mock_get_sbd_device_metadata):
-        mock_get_sbd_device_metadata.return_value = {'msgwait': 10}
-        result = sbd.SBDTimeout.get_sbd_msgwait("/dev/sbd_device")
-        self.assertEqual(result, 10)
-
     @patch('crmsh.sbd.SBDUtils.get_sbd_value_from_config')
     def test_get_sbd_watchdog_timeout_exception(self, mock_get_sbd_value_from_config):
         mock_get_sbd_value_from_config.return_value = None
@@ -246,103 +227,12 @@ def test_get_sbd_systemd_start_timeout(self, mock_cluster_shell, mock_get_system
         mock_cluster_shell.return_value.get_stdout_or_raise_error.assert_called_once_with(sbd.SBDTimeout.SHOW_SBD_START_TIMEOUT_CMD)
         mock_get_systemd_timeout_start_in_sec.assert_called_once_with("1min 30s")
 
-    @patch('crmsh.sbd.SBDTimeout.adjust_systemd_start_timeout')
-    @patch('crmsh.sbd.SBDTimeout.adjust_stonith_timeout')
-    @patch('crmsh.sbd.SBDTimeout.adjust_sbd_delay_start')
-    @patch('crmsh.sbd.SBDTimeout._load_configurations')
-    def test_adjust_sbd_timeout_related_cluster_configuration(self, mock_load_configurations, mock_adjust_sbd_delay_start, mock_adjust_stonith_timeout, 
-                                                              mock_adjust_systemd_start_timeout):
-        sbd.SBDTimeout.adjust_sbd_timeout_related_cluster_configuration()
-        mock_load_configurations.assert_called_once()
-        mock_adjust_sbd_delay_start.assert_called_once()
-        mock_adjust_stonith_timeout.assert_called_once()
-        mock_adjust_systemd_start_timeout.assert_called_once()
-
-    @patch('crmsh.sbd.SBDManager.update_sbd_configuration')
-    def test_adjust_sbd_delay_start_return(self, mock_update_sbd_configuration):
-        inst = sbd.SBDTimeout()
-        inst.sbd_delay_start_value_expected = 100
-        inst.sbd_delay_start_value_from_config = "100"
-        inst.adjust_sbd_delay_start()
-        mock_update_sbd_configuration.assert_not_called()
-
-    @patch('crmsh.sbd.SBDManager.update_sbd_configuration')
-    def test_adjust_sbd_delay_start(self, mock_update_sbd_configuration):
-        inst = sbd.SBDTimeout()
-        inst.sbd_delay_start_value_expected = "no"
-        inst.sbd_delay_start_value_from_config = 200
-        inst.adjust_sbd_delay_start()
-        mock_update_sbd_configuration.assert_called_once_with({'SBD_DELAY_START': 'no'})
-
-    @patch('crmsh.utils.set_property')
-    def test_adjust_stonith_timeout(self, mock_set_property):
-        inst = sbd.SBDTimeout()
-        inst.get_stonith_timeout_expected = MagicMock(return_value=10)
-        inst.adjust_stonith_timeout()
-        mock_set_property.assert_called_once_with("stonith-timeout", 10)
-
-    @patch('crmsh.sbd.SBDTimeout.restore_systemd_start_timeout')
-    @patch('crmsh.sbd.SBDTimeout.get_sbd_systemd_start_timeout')
-    @patch('crmsh.sbd.SBDUtils.get_sbd_value_from_config')
-    def test_adjust_systemd_start_timeout_no_delay_start(self, mock_get_sbd_value_from_config, mock_get_sbd_systemd_start_timeout, mock_restore_systemd_start_timeout):
-        mock_get_sbd_value_from_config.return_value = "no"
-        inst = sbd.SBDTimeout()
-        inst.adjust_systemd_start_timeout()
-        mock_get_sbd_value_from_config.assert_called_once_with("SBD_DELAY_START")
-        mock_get_sbd_systemd_start_timeout.assert_not_called()
-
-    @patch('crmsh.sbd.SBDTimeout.restore_systemd_start_timeout')
-    @patch('crmsh.sbd.SBDTimeout.get_default_systemd_start_timeout')
-    @patch('crmsh.sbd.SBDTimeout.get_sbd_systemd_start_timeout')
-    @patch('crmsh.sbd.SBDUtils.get_sbd_value_from_config')
-    def test_adjust_systemd_start_timeout_return(
-            self,
-            mock_get_sbd_value_from_config,
-            mock_get_sbd_systemd_start_timeout,
-            mock_get_default_systemd_start_timeout,
-            mock_restore_systemd_start_timeout,
-    ):
-        mock_get_sbd_value_from_config.return_value = "10"
-        mock_get_sbd_systemd_start_timeout.return_value = 90
-        mock_get_default_systemd_start_timeout.return_value = 90
-        inst = sbd.SBDTimeout()
-        inst.adjust_systemd_start_timeout()
-        mock_get_sbd_value_from_config.assert_called_once_with("SBD_DELAY_START")
-        mock_get_sbd_systemd_start_timeout.assert_called_once()
-
-    @patch('crmsh.utils.cluster_run_cmd')
-    @patch('crmsh.bootstrap.sync_path')
-    @patch('crmsh.utils.str2file')
-    @patch('crmsh.utils.mkdirp')
-    @patch('crmsh.sbd.SBDTimeout.get_default_systemd_start_timeout')
-    @patch('crmsh.sbd.SBDTimeout.get_sbd_systemd_start_timeout')
-    @patch('crmsh.sbd.SBDUtils.get_sbd_value_from_config')
-    def test_adjust_systemd_start_timeout(
-            self,
-            mock_get_sbd_value_from_config,
-            mock_get_sbd_systemd_start_timeout,
-            mock_get_default_systemd_start_timeout,
-            mock_mkdirp,
-            mock_str2file,
-            mock_sync_file,
-            mock_cluster_run_cmd,
-    ):
-        mock_get_sbd_value_from_config.return_value = "150"
-        mock_get_sbd_systemd_start_timeout.return_value = 90
-        mock_get_default_systemd_start_timeout.return_value = 90
-        inst = sbd.SBDTimeout()
-        inst.adjust_systemd_start_timeout()
-        mock_get_sbd_value_from_config.assert_called_once_with("SBD_DELAY_START")
-        mock_get_sbd_systemd_start_timeout.assert_called_once()
-        mock_mkdirp.assert_called_once_with(sbd.SBDManager.SBD_SYSTEMD_DELAY_START_DIR)
-        mock_cluster_run_cmd.assert_called_once_with("systemctl daemon-reload")
-
     @patch('crmsh.corosync.token_and_consensus_timeout')
     def test_get_sbd_delay_start_expected_diskbased(self, mock_token_and_consensus_timeout):
         inst = sbd.SBDTimeout()
         inst.disk_based = True
         inst.pcmk_delay_max = 10
-        inst.msgwait = 5
+        inst.sbd_msgwait = 5
         mock_token_and_consensus_timeout.return_value = 10
         self.assertEqual(inst.get_sbd_delay_start_expected(), 25)
 
@@ -368,7 +258,7 @@ def test_get_stonith_timeout(self, mock_load_configurations, mock_get_sbd_delay_
     def test_get_stonith_timeout_expected_diskbased(self, mock_token_and_consensus_timeout, mock_logger_debug):
         inst = sbd.SBDTimeout()
         inst.disk_based = True
-        inst.msgwait = 5
+        inst.sbd_msgwait = 5
         mock_token_and_consensus_timeout.return_value = 10
         result = inst.get_stonith_timeout_expected()
         self.assertEqual(result, 70)

test/unittests/test_ui_sbd.py

@@ -239,20 +239,38 @@ def test_configure_show_unknown_arg(self):
             res = self.sbd_instance_diskbased._configure_show(["xxx1", "xxx2"])
         self.assertEqual(str(e.exception), f"Unknown argument: xxx2")
 
-    def test_configure_show_disk_metadata(self):
+    @mock.patch('crmsh.sbd.SBDTimeoutChecker')
+    def test_configure_show_disk_metadata(self, mock_sbd_timeout_checker):
+        mock_sbd_timeout_checker_instance = mock.Mock()
+        mock_sbd_timeout_checker.return_value = mock_sbd_timeout_checker_instance
+        mock_sbd_timeout_checker_instance.check_and_fix = mock.Mock()
         self.sbd_instance_diskbased._show_disk_metadata = mock.Mock()
         self.sbd_instance_diskbased._configure_show(["show", "disk_metadata"])
         self.sbd_instance_diskbased._show_disk_metadata.assert_called_once()
+        mock_sbd_timeout_checker.assert_called_once_with(check_category="disk_metadata")
+        mock_sbd_timeout_checker_instance.check_and_fix.assert_called_once()
 
+    @mock.patch('crmsh.sbd.SBDTimeoutChecker')
     @mock.patch('crmsh.ui_sbd.SBD._show_sysconfig')
-    def test_configure_show_sysconfig(self, mock_show_sysconfig):
+    def test_configure_show_sysconfig(self, mock_show_sysconfig, mock_sbd_timeout_checker):
+        mock_sbd_timeout_checker_instance = mock.Mock()
+        mock_sbd_timeout_checker.return_value = mock_sbd_timeout_checker_instance
+        mock_sbd_timeout_checker_instance.check_and_fix = mock.Mock()
         self.sbd_instance_diskbased._configure_show(["show", "sysconfig"])
         mock_show_sysconfig.assert_called_once()
-
-    def test_configure_show_property(self):
+        mock_sbd_timeout_checker.assert_called_once_with(check_category="sysconfig")
+        mock_sbd_timeout_checker_instance.check_and_fix.assert_called_once()
+
+    @mock.patch('crmsh.sbd.SBDTimeoutChecker')
+    def test_configure_show_property(self, mock_sbd_timeout_checker):
+        mock_sbd_timeout_checker_instance = mock.Mock()
+        mock_sbd_timeout_checker.return_value = mock_sbd_timeout_checker_instance
+        mock_sbd_timeout_checker_instance.check_and_fix = mock.Mock()
         self.sbd_instance_diskbased._show_property = mock.Mock()
         self.sbd_instance_diskbased._configure_show(["show", "property"])
         self.sbd_instance_diskbased._show_property.assert_called_once()
+        mock_sbd_timeout_checker.assert_called_once_with(check_category="property")
+        mock_sbd_timeout_checker_instance.check_and_fix.assert_called_once()
 
     def test_parse_re(self):
         test_data = [
@@ -267,13 +285,18 @@ def test_parse_re(self):
             self.assertIsNotNone(match)
             self.assertEqual(match.groups(), expected)
 
+    @mock.patch('crmsh.sbd.SBDTimeoutChecker')
     @mock.patch('crmsh.ui_sbd.SBD._show_sysconfig')
     @mock.patch('builtins.print')
-    def test_configure_show(self, mock_print, mock_show_sysconfig):
+    def test_configure_show(self, mock_print, mock_show_sysconfig, mock_sbd_timeout_checker):
+        mock_sbd_timeout_checker_instance = mock.Mock()
+        mock_sbd_timeout_checker.return_value = mock_sbd_timeout_checker_instance
+        mock_sbd_timeout_checker_instance.check_and_fix = mock.Mock()
         self.sbd_instance_diskbased._show_disk_metadata = mock.Mock()
         self.sbd_instance_diskbased._show_property = mock.Mock()
         self.sbd_instance_diskbased._configure_show(["show"])
         mock_print.assert_has_calls([mock.call(), mock.call()])
+        mock_sbd_timeout_checker_instance.check_and_fix.assert_called_once()
 
     def test_parse_args_invalid_args(self):
         with self.assertRaises(ui_sbd.SBD.SyntaxError) as e: