fix

Author: benle7

tests/redfish_client_test.py

@@ -917,27 +917,17 @@ def test_exec_curl_cmd_no_http_status_code(self, mock_popen):
     @mock.patch('subprocess.Popen')
     def test_exec_curl_cmd_curl_error(self, mock_popen):
         """Test exec_curl_cmd with curl error"""
-        side_effects = []
-        
         output = (load_redfish_response('mock_bmc_login_token_response'), b'')
         mock_process = mock.Mock()
         mock_process.communicate.return_value = output
         mock_process.returncode = 0
-        side_effects.append(mock_process)
 
         output_error = (b'', b'curl: (28) Operation timed out')
         mock_process2 = mock.Mock()
         mock_process2.communicate.return_value = output_error
         mock_process2.returncode = 28
-        side_effects.append(mock_process2)
-        
-        logout_output = (b'HTTP Status Code: 200', b'')
-        mock_process3 = mock.Mock()
-        mock_process3.communicate.return_value = logout_output
-        mock_process3.returncode = 0
-        side_effects.append(mock_process3)
 
-        mock_popen.side_effect = side_effects
+        mock_popen.side_effect = [mock_process, mock_process2]
 
         rf = RedfishClient(TestRedfishClient.CURL_PATH,
                            TestRedfishClient.BMC_INTERNAL_IP_ADDR,
@@ -946,7 +936,8 @@ def test_exec_curl_cmd_curl_error(self, mock_popen):
 
         rf.login()
         cmd = '/usr/bin/curl -k https://169.254.0.1/test'
-        ret, http_code, output, error = rf.exec_curl_cmd(cmd)
+        
+        ret, http_code, output, error = rf._RedfishClient__exec_curl_cmd_internal(cmd)
 
         assert ret == RedfishClient.ERR_CODE_TIMEOUT
 
@@ -1048,10 +1039,13 @@ def test_wait_task_completion_task_aborted(self, mock_popen):
     @mock.patch('time.sleep')
     def test_wait_task_completion_timeout(self, mock_sleep, mock_time, mock_popen):
         """Test __wait_task_completion with timeout"""
+        side_effects = []
+        
         output = (load_redfish_response('mock_bmc_login_token_response'), b'')
         mock_process = mock.Mock()
         mock_process.communicate.return_value = output
         mock_process.returncode = 0
+        side_effects.append(mock_process)
 
         task_response = json.dumps({
             "PercentComplete": 50,
@@ -1062,10 +1056,11 @@ def test_wait_task_completion_timeout(self, mock_sleep, mock_time, mock_popen):
         mock_process2 = mock.Mock()
         mock_process2.communicate.return_value = output_task
         mock_process2.returncode = 0
+        side_effects.append(mock_process2)
+
+        mock_time.side_effect = [100, 110]
 
-        mock_time.side_effect = [100, 100, 110]
-        
-        mock_popen.side_effect = [mock_process, mock_process2]
+        mock_popen.side_effect = side_effects
 
         rf = RedfishClient(TestRedfishClient.CURL_PATH,
                            TestRedfishClient.BMC_INTERNAL_IP_ADDR,