Dev: unittests: Adjust unit test for previous commit

Author: liangxin1300

test/unittests/test_bootstrap.py

@@ -1806,7 +1806,7 @@ def test_bootstrap_remove_self(self, mock_context, mock_init, mock_active,
         mock_check_all_nodes.assert_called_once_with("removing a node from the cluster")
 
     @mock.patch('crmsh.utils.check_all_nodes_reachable')
-    @mock.patch('crmsh.xmlutil.listnodes')
+    @mock.patch('crmsh.utils.list_cluster_nodes')
     @mock.patch('crmsh.utils.this_node')
     @mock.patch('crmsh.bootstrap.confirm')
     @mock.patch('crmsh.bootstrap.get_node_canonical_hostname')
@@ -1844,7 +1844,7 @@ def test_bootstrap_remove_not_in_cluster(self, mock_context, mock_init, mock_act
     @mock.patch('crmsh.sh.ClusterShell.get_stdout_or_raise_error')
     @mock.patch('crmsh.utils.fetch_cluster_node_list_from_node')
     @mock.patch('crmsh.bootstrap.remove_node_from_cluster')
-    @mock.patch('crmsh.xmlutil.listnodes')
+    @mock.patch('crmsh.utils.list_cluster_nodes')
     @mock.patch('crmsh.utils.this_node')
     @mock.patch('crmsh.bootstrap.confirm')
     @mock.patch('crmsh.bootstrap.get_node_canonical_hostname')
@@ -1882,7 +1882,7 @@ def test_bootstrap_remove(self, mock_context, mock_init, mock_active,
 
     @mock.patch('crmsh.utils.fatal')
     @mock.patch('crmsh.sh.ClusterShell.get_rc_stdout_stderr_without_input')
-    @mock.patch('crmsh.xmlutil.listnodes')
+    @mock.patch('crmsh.utils.list_cluster_nodes')
     @mock.patch('crmsh.utils.this_node')
     def test_remove_self_other_nodes(self, mock_this_node, mock_list, mock_run, mock_error):
         mock_this_node.return_value = 'node1'
@@ -1894,7 +1894,7 @@ def test_remove_self_other_nodes(self, mock_this_node, mock_list, mock_run, mock
             bootstrap._context = mock.Mock(cluster_node="node1", yes_to_all=True)
             bootstrap.remove_self()
 
-        mock_list.assert_called_once_with(include_remote_nodes=False)
+        mock_list.assert_called_once_with()
         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")
 

test/unittests/test_utils.py

@@ -28,7 +28,11 @@ def test_package_is_installed_local(mock_run):
 
 @mock.patch('re.search')
 @mock.patch('crmsh.sh.ShellUtils.get_stdout')
-def test_get_nodeid_from_name_run_None1(mock_get_stdout, mock_re_search):
+@mock.patch('crmsh.xmlutil.CrmMonXmlParser')
+def test_get_nodeid_from_name_run_None1(mock_parser, mock_get_stdout, mock_re_search):
+    mock_parser_inst = mock.Mock()
+    mock_parser.return_value = mock_parser_inst
+    mock_parser_inst.is_node_remote.return_value = False
     mock_get_stdout.return_value = (1, None)
     mock_re_search_inst = mock.Mock()
     mock_re_search.return_value = mock_re_search_inst
@@ -40,7 +44,11 @@ def test_get_nodeid_from_name_run_None1(mock_get_stdout, mock_re_search):
 
 @mock.patch('re.search')
 @mock.patch('crmsh.sh.ShellUtils.get_stdout')
-def test_get_nodeid_from_name_run_None2(mock_get_stdout, mock_re_search):
+@mock.patch('crmsh.xmlutil.CrmMonXmlParser')
+def test_get_nodeid_from_name_run_None2(mock_parser, mock_get_stdout, mock_re_search):
+    mock_parser_inst = mock.Mock()
+    mock_parser.return_value = mock_parser_inst
+    mock_parser_inst.is_node_remote.return_value = False
     mock_get_stdout.return_value = (0, "172167901 node1 member\n172168231 node2 member")
     mock_re_search.return_value = None
     res = utils.get_nodeid_from_name("node111")
@@ -51,7 +59,11 @@ def test_get_nodeid_from_name_run_None2(mock_get_stdout, mock_re_search):
 
 @mock.patch('re.search')
 @mock.patch('crmsh.sh.ShellUtils.get_stdout')
-def test_get_nodeid_from_name(mock_get_stdout, mock_re_search):
+@mock.patch('crmsh.xmlutil.CrmMonXmlParser')
+def test_get_nodeid_from_name(mock_parser, mock_get_stdout, mock_re_search):
+    mock_parser_inst = mock.Mock()
+    mock_parser.return_value = mock_parser_inst
+    mock_parser_inst.is_node_remote.return_value = False
     mock_get_stdout.return_value = (0, "172167901 node1 member\n172168231 node2 member")
     mock_re_search_inst = mock.Mock()
     mock_re_search.return_value = mock_re_search_inst
@@ -1000,16 +1012,6 @@ def test_detect_virt(mock_run):
     mock_run.assert_called_once_with("systemd-detect-virt")
 
 
-@mock.patch('crmsh.sh.ClusterShell.get_stdout_or_raise_error')
-def test_is_standby(mock_run):
-    mock_run.return_value = """
-Node List:
-* Node 15sp2-1: standby
-    """
-    assert utils.is_standby("15sp2-1") is True
-    mock_run.assert_called_once_with("crm_mon -1")
-
-
 @mock.patch('crmsh.sh.cluster_shell')
 def test_get_dlm_option_dict(mock_run):
     mock_run_inst = mock.Mock()
@@ -1461,7 +1463,7 @@ def test_validate_and_get_reachable_nodes_not_a_member(mock_list_nodes, mock_fat
     mock_fatal.side_effect = ValueError
     with pytest.raises(ValueError):
         utils.validate_and_get_reachable_nodes(["node3"])
-    mock_fatal.assert_called_once_with("Node 'node3' is not a member of the cluster")
+    mock_fatal.assert_called_once_with("Node \"node3\" is not in the cluster")
 
 
 @mock.patch('crmsh.utils.this_node')

test/unittests/test_xmlutil.py

@@ -1,3 +1,4 @@
+from lxml import etree
 import unittest
 
 try:
@@ -7,21 +8,12 @@
 
 from crmsh import xmlutil, constants
 
-
-class TestCrmMonXmlParser(unittest.TestCase):
-    """
-    Unitary tests for crmsh.xmlutil.CrmMonXmlParser
-    """
-    @mock.patch('crmsh.sh.cluster_shell')
-    def setUp(self, mock_cluster_shell):
-        """
-        Test setUp.
-        """
-        data = '''
+FAKE_XML = '''
 <data>
   <nodes>
     <node name="tbw-1" id="1084783148" online="true" standby="true" standby_onfail="false" maintenance="false" pending="false" unclean="false" shutdown="false" expected_up="true" is_dc="true" resources_running="3" type="member"/>
     <node name="tbw-2" id="1084783312" online="false" standby="false" standby_onfail="false" maintenance="false" pending="false" unclean="false" shutdown="false" expected_up="true" is_dc="false" resources_running="2" type="member"/>
+    <node name="tbw-3" id="alp-2" online="true" standby="false" standby_onfail="false" maintenance="true" pending="false" unclean="false" health="green" shutdown="false" expected_up="false" is_dc="false" resources_running="0" type="remote"/>
   </nodes>
   <resources>
     <resource id="ocfs2-dlm" resource_agent="ocf:pacemaker:controld" role="Started" active="true" orphaned="false" blocked="false" managed="true" failed="false" failure_ignored="false" nodes_running_on="1">
@@ -32,17 +24,32 @@ def setUp(self, mock_cluster_shell):
     </resource>
   </resources>
 </data>
-        '''
-        mock_cluster_shell().get_rc_stdout_stderr_without_input.return_value = (0, data, '')
+'''
+
+
+class TestCrmMonXmlParser(unittest.TestCase):
+    """
+    Unitary tests for crmsh.xmlutil.CrmMonXmlParser
+    """
+    @mock.patch('crmsh.sh.cluster_shell')
+    def setUp(self, mock_cluster_shell):
+        """
+        Test setUp.
+        """
+        mock_cluster_shell().get_rc_stdout_stderr_without_input.return_value = (0, FAKE_XML, '')
         self.parser_inst = xmlutil.CrmMonXmlParser()
 
     def test_is_node_online(self):
         assert self.parser_inst.is_node_online("tbw-1") is True
         assert self.parser_inst.is_node_online("tbw-2") is False
 
-    def test_get_node_list(self):
-        assert self.parser_inst.get_node_list(standby=True) == ['tbw-1']
-        assert self.parser_inst.get_node_list(online=False) == ['tbw-2']
+    def test_is_node_maintenance(self):
+        assert self.parser_inst.is_node_maintenance("tbw-1") is False
+        assert self.parser_inst.is_node_maintenance("tbw-3") is True
+
+    def test_is_node_remote(self):
+        assert self.parser_inst.is_node_remote("tbw-1") is False
+        assert self.parser_inst.is_node_remote("tbw-3") is True
 
     def test_is_resource_configured(self):
         assert self.parser_inst.is_resource_configured("test") is False
@@ -59,3 +66,10 @@ def test_is_resource_started(self):
     def test_get_resource_id_list_via_type(self):
         assert self.parser_inst.get_resource_id_list_via_type("test") == []
         assert self.parser_inst.get_resource_id_list_via_type("ocf:pacemaker:controld")[0] == "ocfs2-dlm"
+
+    def test_get_node_list(self):
+        assert self.parser_inst.get_node_list() == ['tbw-1', 'tbw-2', 'tbw-3']
+        assert self.parser_inst.get_node_list(online=True) == ['tbw-1', 'tbw-3']
+        assert self.parser_inst.get_node_list(maintenance=True) == ['tbw-3']
+        assert self.parser_inst.get_node_list(node_type="remote") == ['tbw-3']
+        assert self.parser_inst.get_node_list(node_type="member") == ['tbw-1', 'tbw-2']