Dev: unittests: Adjust unit test for previous commit

Author: liangxin1300

test/unittests/test_crashtest_utils.py

@@ -367,23 +367,14 @@ def test_check_node_status(self, mock_run, mock_error):
             ])
         mock_error.assert_not_called()
 
-    @mock.patch('crmsh.sh.ShellUtils.get_stdout_stderr')
-    def test_online_nodes_empty(self, mock_run):
-        mock_run.return_value = (0, "data", None)
-        res = utils.online_nodes()
-        self.assertEqual(res, [])
-        mock_run.assert_called_once_with("crm_mon -1")
-
-    @mock.patch('crmsh.sh.ShellUtils.get_stdout_stderr')
-    def test_online_nodes(self, mock_run):
-        output = """
-Node List:
-  * Online: [ 15sp2-1 15sp2-2 ]
-        """
-        mock_run.return_value = (0, output, None)
+    @mock.patch('crmsh.xmlutil.CrmMonXmlParser')
+    def test_online_nodes(self, mock_crmmon_parser):
+        mock_inst = mock.Mock()
+        mock_crmmon_parser.return_value = mock_inst
+        mock_inst.get_node_list.return_value = ["node1", "node2"]
         res = utils.online_nodes()
-        self.assertEqual(res, ["15sp2-1", "15sp2-2"])
-        mock_run.assert_called_once_with("crm_mon -1")
+        self.assertEqual(res, ["node1", "node2"])
+        mock_inst.get_node_list.assert_called_once_with(online=True, node_type='member')
 
     @mock.patch('crmsh.crash_test.utils.online_nodes')
     def test_peer_node_list_empty(self, mock_online):

test/unittests/test_utils.py

@@ -1052,11 +1052,13 @@ def test_set_dlm_option(mock_get_dict, mock_run):
     mock_run_inst.get_stdout_or_raise_error.assert_called_once_with('dlm_tool set_config "key2=test"', None)
 
 
-@mock.patch('crmsh.utils.has_resource_configured')
-def test_is_dlm_configured(mock_configured):
-    mock_configured.return_value = True
+@mock.patch('crmsh.xmlutil.CrmMonXmlParser')
+def test_is_dlm_configured(mock_crmmon):
+    mock_crmmon_inst = mock.Mock()
+    mock_crmmon.return_value = mock_crmmon_inst
+    mock_crmmon_inst.is_resource_configured.return_value = True
     assert utils.is_dlm_configured() is True
-    mock_configured.assert_called_once_with(constants.DLM_CONTROLD_RA, peer=None)
+    mock_crmmon_inst.is_resource_configured.assert_called_once_with(constants.DLM_CONTROLD_RA)
 
 
 @mock.patch('crmsh.sh.cluster_shell')