Description: Fix testsuite Make sure testsuite output works with Pacemaker 2. Author: Valentin Vidic Last-Update: 2021-02-03 --- a/test/unittests/test_bootstrap.py +++ b/test/unittests/test_bootstrap.py @@ -284,7 +284,7 @@ def test_init_ssh(self, mock_start_service, mock_config_ssh): bootstrap._context = mock.Mock(node_list=[]) bootstrap.init_ssh() - mock_start_service.assert_called_once_with("sshd.service", enable=True) + mock_start_service.assert_called_once_with("ssh.service", enable=True) mock_config_ssh.assert_has_calls([ mock.call("root"), mock.call("hacluster") @@ -446,7 +446,7 @@ bootstrap.join_ssh("node1") - mock_start_service.assert_called_once_with("sshd.service", enable=True) + mock_start_service.assert_called_once_with("ssh.service", enable=True) mock_config_ssh.assert_has_calls([ mock.call("root"), mock.call("hacluster") --- a/test/unittests/test_utils.py +++ b/test/unittests/test_utils.py @@ -49,12 +49,12 @@ mock_to_ascii.assert_called_once_with(None) -@mock.patch("crmsh.utils.get_stdout") +@mock.patch("crmsh.utils.get_stdout_stderr") def test_package_is_installed_local(mock_run): - mock_run.return_value = (0, None) + mock_run.return_value = (0, None, None) res = utils.package_is_installed("crmsh") assert res is True - mock_run.assert_called_once_with("rpm -q --quiet crmsh") + mock_run.assert_called_once_with("dpkg-query --status crmsh") @mock.patch("crmsh.utils.run_cmd_on_remote") @@ -63,7 +63,7 @@ res = utils.package_is_installed("crmsh", "other_node") assert res is True mock_run_remote.assert_called_once_with( - "rpm -q --quiet crmsh", + "dpkg-query --status crmsh", "other_node", "Check whether crmsh is installed on other_node") --- a/test/unittests/test_sbd.py +++ b/test/unittests/test_sbd.py @@ -502,9 +502,9 @@ self.sbd_inst._update_sbd_configuration() - mock_copy.assert_called_once_with("/usr/share/fillup-templates/sysconfig.sbd", "/etc/sysconfig/sbd") - mock_sysconfig.assert_called_once_with("/etc/sysconfig/sbd", SBD_WATCHDOG_DEV='/dev/watchdog', SBD_DEVICE='/dev/sdb1;/dev/sdc1', SBD_WATCHDOG_TIMEOUT="15") - mock_update.assert_called_once_with("/etc/sysconfig/sbd") + mock_copy.assert_called_once_with("/usr/share/fillup-templates/sysconfig.sbd", "/etc/default/sbd") + mock_sysconfig.assert_called_once_with("/etc/default/sbd", SBD_WATCHDOG_DEV='/dev/watchdog', SBD_DEVICE='/dev/sdb1;/dev/sdc1', SBD_WATCHDOG_TIMEOUT="15") + mock_update.assert_called_once_with("/etc/default/sbd") @mock.patch('crmsh.bootstrap.utils.parse_sysconfig') def test_get_sbd_device_from_config_none(self, mock_parse): @@ -515,7 +515,7 @@ res = self.sbd_inst._get_sbd_device_from_config() assert res == [] - mock_parse.assert_called_once_with("/etc/sysconfig/sbd") + mock_parse.assert_called_once_with("/etc/default/sbd") mock_parse_inst.get.assert_called_once_with("SBD_DEVICE") @mock.patch('crmsh.utils.re_split_string') @@ -529,7 +529,7 @@ res = self.sbd_inst._get_sbd_device_from_config() assert res == ["/dev/sdb1", "/dev/sdc1"] - mock_parse.assert_called_once_with("/etc/sysconfig/sbd") + mock_parse.assert_called_once_with("/etc/default/sbd") mock_parse_inst.get.assert_called_once_with("SBD_DEVICE") mock_split.assert_called_once_with(sbd.SBDManager.PARSE_RE, "/dev/sdb1;/dev/sdc1") @@ -699,7 +699,7 @@ mock_exists.return_value = False self.sbd_inst.join_sbd("node1") mock_package.assert_called_once_with("sbd") - mock_exists.assert_called_once_with("/etc/sysconfig/sbd") + mock_exists.assert_called_once_with("/etc/default/sbd") mock_invoke.assert_called_once_with("systemctl disable sbd.service") @mock.patch('crmsh.bootstrap.invoke') @@ -714,7 +714,7 @@ self.sbd_inst.join_sbd("node1") mock_package.assert_called_once_with("sbd") - mock_exists.assert_called_once_with("/etc/sysconfig/sbd") + mock_exists.assert_called_once_with("/etc/default/sbd") mock_invoke.assert_called_once_with("systemctl disable sbd.service") mock_enabled.assert_called_once_with("sbd.service", "node1") @@ -739,7 +739,7 @@ self.sbd_inst.join_sbd("node1") mock_package.assert_called_once_with("sbd") - mock_exists.assert_called_once_with("/etc/sysconfig/sbd") + mock_exists.assert_called_once_with("/etc/default/sbd") mock_invoke.assert_called_once_with("systemctl enable sbd.service") mock_get_device.assert_called_once_with() mock_verify.assert_called_once_with(["/dev/sdb1"], ["node1"]) @@ -769,7 +769,7 @@ self.sbd_inst.join_sbd("node1") mock_package.assert_called_once_with("sbd") - mock_exists.assert_called_once_with("/etc/sysconfig/sbd") + mock_exists.assert_called_once_with("/etc/default/sbd") mock_invoke.assert_called_once_with("systemctl enable sbd.service") mock_get_device.assert_called_once_with() mock_warn.assert_called_once_with("node1") --- a/test/unittests/test_ui_cluster.py +++ b/test/unittests/test_ui_cluster.py @@ -44,11 +44,13 @@ mock_qdevice_configured.return_value = False context_inst = mock.Mock() mock_parse_nodes.return_value = ["node1", "node2"] - mock_active.side_effect = [True, True] + mock_active.side_effect = [True, True, True, True] self.ui_cluster_inst.do_start(context_inst, "node1", "node2") mock_parse_nodes.assert_called_once_with(context_inst, "node1", "node2") mock_active.assert_has_calls([ + mock.call("corosync.service", remote_addr="node1"), mock.call("pacemaker.service", remote_addr="node1"), + mock.call("corosync.service", remote_addr="node2"), mock.call("pacemaker.service", remote_addr="node2") ]) mock_info.assert_has_calls([ @@ -66,12 +68,13 @@ def test_do_start(self, mock_parse_nodes, mock_active, mock_start, mock_qdevice_configured, mock_info, mock_start_pacemaker, mock_check_qdevice): context_inst = mock.Mock() mock_parse_nodes.return_value = ["node1"] - mock_active.side_effect = [False, False] + mock_active.side_effect = [False, False, False] mock_qdevice_configured.return_value = True self.ui_cluster_inst.do_start(context_inst, "node1") mock_active.assert_has_calls([ + mock.call("corosync.service", remote_addr="node1"), mock.call("pacemaker.service", remote_addr="node1"), mock.call("corosync-qdevice.service", remote_addr="node1") ])