Dev: unittests: Adjust unit test for previous commit

Author: liangxin1300

test/unittests/test_qdevice.py

@@ -203,7 +203,7 @@ def test_qdevice_p12_on_cluster(self):
         self.assertEqual(res, "/etc/corosync/qdevice/net/node1.com/qdevice-net-node.p12")
 
     @mock.patch('crmsh.utils.InterfacesInfo.ip_in_local')
-    @mock.patch('crmsh.utils.node_reachable_check')
+    @mock.patch('crmsh.utils.ssh_reachable_check')
     @mock.patch('socket.getaddrinfo')
     def test_check_qnetd_addr_local(self, mock_getaddrinfo, mock_reachable, mock_in_local):
         mock_getaddrinfo.return_value = [(None, ("10.10.10.123",)),]

test/unittests/test_ui_cluster.py

@@ -38,15 +38,15 @@ def tearDownClass(cls):
 
     @mock.patch('logging.Logger.info')
     @mock.patch('crmsh.service_manager.ServiceManager.service_is_active')
-    @mock.patch('crmsh.ui_cluster.parse_option_for_nodes')
+    @mock.patch('crmsh.ui_utils.parse_and_validate_node_args')
     @mock.patch('crmsh.corosync.is_qdevice_configured')
     def test_do_start_already_started(self, mock_qdevice_configured, mock_parse_nodes, mock_active, mock_info):
         mock_qdevice_configured.return_value = False
         context_inst = mock.Mock()
         mock_parse_nodes.return_value = ["node1", "node2"]
         mock_active.side_effect = [True, True]
         self.ui_cluster_inst.do_start(context_inst, "node1", "node2")
-        mock_parse_nodes.assert_called_once_with(context_inst, "node1", "node2")
+        mock_parse_nodes.assert_called_once_with("start", "node1", "node2")
         mock_active.assert_has_calls([
             mock.call("pacemaker.service", remote_addr="node1"),
             mock.call("pacemaker.service", remote_addr="node2")
@@ -63,7 +63,7 @@ def test_do_start_already_started(self, mock_qdevice_configured, mock_parse_node
     @mock.patch('crmsh.corosync.is_qdevice_configured')
     @mock.patch('crmsh.service_manager.ServiceManager.start_service')
     @mock.patch('crmsh.service_manager.ServiceManager.service_is_active')
-    @mock.patch('crmsh.ui_cluster.parse_option_for_nodes')
+    @mock.patch('crmsh.ui_utils.parse_and_validate_node_args')
     def test_do_start(self, mock_parse_nodes, mock_active, mock_start, mock_qdevice_configured, mock_info, mock_error, mock_start_pacemaker, mock_check_qdevice):
         context_inst = mock.Mock()
         mock_start_pacemaker.return_value = ["node1"]
@@ -86,15 +86,15 @@ def test_do_start(self, mock_parse_nodes, mock_active, mock_start, mock_qdevice_
 
     @mock.patch('crmsh.utils.wait_for_dc')
     @mock.patch('crmsh.ui_cluster.Cluster._node_ready_to_stop_cluster_service')
-    @mock.patch('crmsh.ui_cluster.parse_option_for_nodes')
+    @mock.patch('crmsh.ui_utils.parse_and_validate_node_args')
     def test_do_stop_return(self, mock_parse_nodes, mock_node_ready_to_stop_cluster_service, mock_dc):
         mock_parse_nodes.return_value = ["node1", "node2"]
         mock_node_ready_to_stop_cluster_service.side_effect = [False, False]
 
         context_inst = mock.Mock()
         self.ui_cluster_inst.do_stop(context_inst, "node1", "node2")
 
-        mock_parse_nodes.assert_called_once_with(context_inst, "node1", "node2")
+        mock_parse_nodes.assert_called_once_with("stop", "node1", "node2")
         mock_node_ready_to_stop_cluster_service.assert_has_calls([mock.call("node1"), mock.call("node2")])
         mock_dc.assert_not_called()
 
@@ -104,7 +104,7 @@ def test_do_stop_return(self, mock_parse_nodes, mock_node_ready_to_stop_cluster_
     @mock.patch('crmsh.ui_cluster.Cluster._set_dlm')
     @mock.patch('crmsh.utils.wait_for_dc')
     @mock.patch('crmsh.ui_cluster.Cluster._node_ready_to_stop_cluster_service')
-    @mock.patch('crmsh.ui_cluster.parse_option_for_nodes')
+    @mock.patch('crmsh.ui_utils.parse_and_validate_node_args')
     def test_do_stop(self, mock_parse_nodes, mock_node_ready_to_stop_cluster_service, mock_dc,
                      mock_set_dlm, mock_service_manager, mock_info, mock_debug):
         mock_parse_nodes.return_value = ["node1", "node2"]
@@ -117,7 +117,7 @@ def test_do_stop(self, mock_parse_nodes, mock_node_ready_to_stop_cluster_service
         context_inst = mock.Mock()
         self.ui_cluster_inst.do_stop(context_inst, "node1", "node2")
 
-        mock_parse_nodes.assert_called_once_with(context_inst, "node1", "node2")
+        mock_parse_nodes.assert_called_once_with("stop", "node1", "node2")
         mock_node_ready_to_stop_cluster_service.assert_has_calls([mock.call("node1"), mock.call("node2")])
         mock_debug.assert_called_once_with("stop node list: ['node1']")
         mock_dc.assert_called_once_with("node1")

test/unittests/test_utils.py

@@ -982,7 +982,7 @@ def test_is_block_device(mock_stat, mock_isblk):
     mock_isblk.assert_called_once_with(12345)
 
 
-@mock.patch('crmsh.utils.node_reachable_check')
+@mock.patch('crmsh.utils.ssh_reachable_check')
 @mock.patch('crmsh.xmlutil.CrmMonXmlParser')
 def test_check_all_nodes_reachable_dead_nodes(mock_xml, mock_reachable):
     mock_xml_inst = mock.Mock()
@@ -995,7 +995,7 @@ def test_check_all_nodes_reachable_dead_nodes(mock_xml, mock_reachable):
     assert err.value.dead_nodes == ["node2"]
 
 
-@mock.patch('crmsh.utils.node_reachable_check')
+@mock.patch('crmsh.utils.ssh_reachable_check')
 @mock.patch('crmsh.xmlutil.CrmMonXmlParser')
 def test_check_all_nodes_reachable(mock_xml, mock_reachable):
     mock_xml_inst = mock.Mock()
@@ -1410,7 +1410,7 @@ def test_is_dc_idle(mock_dc, mock_shell):
 
 
 @mock.patch('logging.Logger.warning')
-@mock.patch('crmsh.utils.node_reachable_check')
+@mock.patch('crmsh.utils.ssh_reachable_check')
 def test_get_reachable_node_list(mock_reachable, mock_warn):
     mock_reachable.side_effect = [False, True, ValueError("error for node3")]
     assert utils.get_reachable_node_list(["node1", "node2", "node3"]) == ["node2"]