Dev: unittests: Adjust unit test for previous commit

Author: liangxin1300

test/unittests/test_sbd.py

@@ -186,19 +186,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,78 +233,6 @@ 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_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_restore_systemd_start_timeout):
-        mock_get_sbd_value_from_config.return_value = "10"
-        mock_get_sbd_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_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_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
-        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()