From ccb417eb6261aa685e6edd5b8d9ea1c2a9ee366d Mon Sep 17 00:00:00 2001 From: isaacyang Date: Fri, 13 Sep 2024 10:16:00 +0800 Subject: [PATCH] Fix the unittest parameter order --- providers/base/tests/test_wifi_nmcli_test.py | 168 ++++++++----------- 1 file changed, 66 insertions(+), 102 deletions(-) diff --git a/providers/base/tests/test_wifi_nmcli_test.py b/providers/base/tests/test_wifi_nmcli_test.py index ba279082bd..9874717dea 100644 --- a/providers/base/tests/test_wifi_nmcli_test.py +++ b/providers/base/tests/test_wifi_nmcli_test.py @@ -278,38 +278,39 @@ def test_show_aps_multiple_aps(self, mock_print): class TestWaitForConnected(unittest.TestCase): @patch("wifi_nmcli_test.print_cmd", new=MagicMock()) - @patch("wifi_nmcli_test.sp.check_output") - @patch("wifi_nmcli_test.time.sleep", return_value=None) - def test_wait_for_connected_success(self, mock_sleep, mock_check_output): - mock_check_output.side_effect = [ - b"100:connected\nTestESSID", - ] + @patch("wifi_nmcli_test.time.sleep", MagicMock(return_value=None)) + @patch( + "wifi_nmcli_test.sp.check_output", + MagicMock( + side_effect=[ + b"30:disconnected\nTestESSID", + b"100:connected\nTestESSID", + ] + ) + ) + def test_wait_for_connected_success(self): interface = "wlan0" essid = "TestESSID" self.assertTrue(wait_for_connected(interface, essid)) @patch( "wifi_nmcli_test.sp.check_output", - return_value=b"30:disconnected\nTestESSID", + MagicMock(return_value=b"30:disconnected\nTestESSID"), ) - @patch("wifi_nmcli_test.print_cmd") - @patch("wifi_nmcli_test.time.sleep", return_value=None) - def test_wait_for_connected_failure_due_to_timeout( - self, mock_sleep, mock_print_cmd, mock_check_output - ): + @patch("wifi_nmcli_test.print_cmd", new=MagicMock()) + @patch("wifi_nmcli_test.time.sleep", MagicMock(return_value=None)) + def test_wait_for_connected_failure_due_to_timeout(self): interface = "wlan0" essid = "TestESSID" self.assertFalse(wait_for_connected(interface, essid, max_wait=3)) @patch( "wifi_nmcli_test.sp.check_output", - return_value=b"100:connected\nWrongESSID", + MagicMock(return_value=b"100:connected\nWrongESSID"), ) - @patch("wifi_nmcli_test.print_cmd") - @patch("wifi_nmcli_test.time.sleep", return_value=None) - def test_wait_for_connected_failure_due_to_essid_mismatch( - self, mock_sleep, mock_print_cmd, mock_check_output - ): + @patch("wifi_nmcli_test.print_cmd", new=MagicMock()) + @patch("wifi_nmcli_test.time.sleep", MagicMock(return_value=None)) + def test_wait_for_connected_failure_due_to_essid_mismatch(self): interface = "wlan0" essid = "TestESSID" self.assertFalse(wait_for_connected(interface, essid)) @@ -339,30 +340,21 @@ def test_open_connection_success( @patch("wifi_nmcli_test.turn_up_connection", new=MagicMock()) @patch("wifi_nmcli_test.print_head", new=MagicMock()) @patch("wifi_nmcli_test.print_cmd", new=MagicMock()) - @patch("wifi_nmcli_test.perform_ping_test", return_value=False) - @patch("wifi_nmcli_test.wait_for_connected", return_value=True) - def test_open_connection_failed_ping( - self, wait_for_connected_mock, perform_ping_test_mock - ): + @patch("wifi_nmcli_test.perform_ping_test", MagicMock(return_value=False)) + @patch("wifi_nmcli_test.wait_for_connected", MagicMock(return_value=True)) + def test_open_connection_failed_ping(self): args = type("", (), {})() args.device = "wlan0" args.essid = "TestESSID" rc = open_connection(args) self.assertEqual(rc, 1) - @patch("wifi_nmcli_test.sp.call") - @patch("wifi_nmcli_test.wait_for_connected", return_value=False) - @patch("wifi_nmcli_test.print_head") - @patch("wifi_nmcli_test.print_cmd") - @patch("wifi_nmcli_test.turn_up_connection") - def test_open_connection_failed_to_connect( - self, - print_cmd_mock, - turn_up_mock, - print_head_mock, - wait_for_connected_mock, - sp_call_mock, - ): + @patch("wifi_nmcli_test.sp.call", new=MagicMock()) + @patch("wifi_nmcli_test.print_head", new=MagicMock()) + @patch("wifi_nmcli_test.print_cmd", new=MagicMock()) + @patch("wifi_nmcli_test.turn_up_connection", new=MagicMock()) + @patch("wifi_nmcli_test.wait_for_connected", MagicMock(return_value=False)) + def test_open_connection_failed_to_connect(self): args = type("", (), {})() args.device = "wlan0" args.essid = "TestESSID" @@ -371,22 +363,17 @@ def test_open_connection_failed_to_connect( class TestSecuredConnection(unittest.TestCase): - @patch("wifi_nmcli_test.sp.call") + @patch("wifi_nmcli_test.sp.call", new=MagicMock()) + @patch("wifi_nmcli_test.print_route_info", new=MagicMock()) + @patch("wifi_nmcli_test.print_address_info", new=MagicMock()) + @patch("wifi_nmcli_test.turn_up_connection", new=MagicMock()) + @patch("wifi_nmcli_test.sp.check_output", new=MagicMock()) @patch("wifi_nmcli_test.wait_for_connected", return_value=True) @patch("wifi_nmcli_test.perform_ping_test", return_value=True) - @patch("wifi_nmcli_test.print_route_info") - @patch("wifi_nmcli_test.print_address_info") - @patch("wifi_nmcli_test.turn_up_connection") - @patch("wifi_nmcli_test.sp.check_output") def test_secured_connection_success( self, - check_output_mock, - turn_up_connection_mock, - print_address_info_mock, - print_route_info_mock, perform_ping_test_mock, wait_for_connected_mock, - sp_call_mock, ): args = type("", (), {})() args.device = "wlan0" @@ -398,22 +385,17 @@ def test_secured_connection_success( wait_for_connected_mock.assert_called_with("wlan0", "TEST_CON") perform_ping_test_mock.assert_called_with("wlan0") - @patch("wifi_nmcli_test.sp.call") + @patch("wifi_nmcli_test.sp.call", new=MagicMock()) + @patch("wifi_nmcli_test.print_route_info", new=MagicMock()) + @patch("wifi_nmcli_test.print_address_info", new=MagicMock()) + @patch("wifi_nmcli_test.turn_up_connection", new=MagicMock()) + @patch("wifi_nmcli_test.sp.check_output", new=MagicMock()) @patch("wifi_nmcli_test.wait_for_connected", return_value=False) @patch("wifi_nmcli_test.perform_ping_test", return_value=False) - @patch("wifi_nmcli_test.print_route_info") - @patch("wifi_nmcli_test.print_address_info") - @patch("wifi_nmcli_test.turn_up_connection") - @patch("wifi_nmcli_test.sp.check_output") def test_secured_connection_fail_to_connect( self, - check_output_mock, - turn_up_connection_mock, - print_address_info_mock, - print_route_info_mock, perform_ping_test_mock, wait_for_connected_mock, - sp_call_mock, ): args = type("", (), {})() args.device = "wlan0" @@ -425,22 +407,17 @@ def test_secured_connection_fail_to_connect( wait_for_connected_mock.assert_called_with("wlan0", "TEST_CON") perform_ping_test_mock.assert_not_called() - @patch("wifi_nmcli_test.sp.call") + @patch("wifi_nmcli_test.sp.call", new=MagicMock()) + @patch("wifi_nmcli_test.print_route_info", new=MagicMock()) + @patch("wifi_nmcli_test.print_address_info", new=MagicMock()) + @patch("wifi_nmcli_test.turn_up_connection", new=MagicMock()) + @patch("wifi_nmcli_test.sp.check_output", new=MagicMock()) @patch("wifi_nmcli_test.wait_for_connected", return_value=False) @patch("wifi_nmcli_test.perform_ping_test", return_value=True) - @patch("wifi_nmcli_test.print_route_info") - @patch("wifi_nmcli_test.print_address_info") - @patch("wifi_nmcli_test.turn_up_connection") - @patch("wifi_nmcli_test.sp.check_output") def test_secured_connection_command_failure( self, - check_output_mock, - turn_up_connection_mock, - print_address_info_mock, - print_route_info_mock, perform_ping_test_mock, wait_for_connected_mock, - sp_call_mock, ): args = type("", (), {})() args.device = "wlan0" @@ -505,32 +482,30 @@ def test_parser_args_ap(self): class TestMainFunction(unittest.TestCase): - @patch("wifi_nmcli_test.delete_test_ap_ssid_connection") + @patch("wifi_nmcli_test.delete_test_ap_ssid_connection", new=MagicMock()) + @patch("wifi_nmcli_test.turn_down_nm_connections", new=MagicMock()) + @patch("wifi_nmcli_test.turn_up_connection", new=MagicMock()) + @patch("wifi_nmcli_test.device_rescan", new=MagicMock()) @patch( "wifi_nmcli_test.get_nm_activate_connection", return_value="uuid123" ) - @patch("wifi_nmcli_test.turn_down_nm_connections") - @patch("wifi_nmcli_test.turn_up_connection") @patch("wifi_nmcli_test.list_aps", return_value={}) @patch("wifi_nmcli_test.sys.argv", ["wifi_nmcli_test.py", "scan", "wlan0"]) - @patch("wifi_nmcli_test.device_rescan") def test_main_scan_no_aps_found( self, list_aps_mock, - turn_up_connection_mock, - turn_down_nm_connections_mock, get_nm_activate_connection_mock, - delete_test_ap_ssid_connection_mock, - mock_device_rescan, ): main() - @patch("wifi_nmcli_test.delete_test_ap_ssid_connection") + @patch("wifi_nmcli_test.delete_test_ap_ssid_connection", new=MagicMock()) + @patch("wifi_nmcli_test.turn_down_nm_connections", new=MagicMock()) + @patch("wifi_nmcli_test.turn_up_connection", new=MagicMock()) + @patch("wifi_nmcli_test.device_rescan", new=MagicMock()) @patch( - "wifi_nmcli_test.get_nm_activate_connection", return_value="uuid123" + "wifi_nmcli_test.get_nm_activate_connection", + return_value="uuid123", ) - @patch("wifi_nmcli_test.turn_down_nm_connections") - @patch("wifi_nmcli_test.turn_up_connection") @patch( "wifi_nmcli_test.list_aps", return_value={ @@ -540,47 +515,41 @@ def test_main_scan_no_aps_found( }, ) @patch("wifi_nmcli_test.sys.argv", ["wifi_nmcli_test.py", "scan", "wlan0"]) - @patch("wifi_nmcli_test.device_rescan") def test_main_scan_aps_found( self, list_aps_mock, - turn_up_connection_mock, - turn_down_nm_connections_mock, get_nm_activate_connection_mock, - delete_test_ap_ssid_connection_mock, - mock_device_rescan, ): main() - @patch("wifi_nmcli_test.delete_test_ap_ssid_connection") + @patch("wifi_nmcli_test.delete_test_ap_ssid_connection", new=MagicMock()) + @patch("wifi_nmcli_test.turn_down_nm_connections", new=MagicMock()) + @patch("wifi_nmcli_test.turn_up_connection", new=MagicMock()) + @patch("wifi_nmcli_test.device_rescan", new=MagicMock()) @patch( - "wifi_nmcli_test.get_nm_activate_connection", return_value="uuid123" + "wifi_nmcli_test.get_nm_activate_connection", + return_value="uuid123", ) - @patch("wifi_nmcli_test.turn_down_nm_connections") - @patch("wifi_nmcli_test.turn_up_connection") @patch("wifi_nmcli_test.list_aps", return_value={}) @patch( "wifi_nmcli_test.sys.argv", ["wifi_nmcli_test.py", "open", "wlan0", "TestSSID"], ) - @patch("wifi_nmcli_test.device_rescan") def test_main_open_no_aps_found( self, list_aps_mock, - turn_up_connection_mock, - turn_down_nm_connections_mock, get_nm_activate_connection_mock, - delete_test_ap_ssid_connection_mock, - mock_device_rescan, ): main() - @patch("wifi_nmcli_test.delete_test_ap_ssid_connection") + @patch("wifi_nmcli_test.delete_test_ap_ssid_connection", new=MagicMock()) @patch( - "wifi_nmcli_test.get_nm_activate_connection", return_value="uuid123" + "wifi_nmcli_test.get_nm_activate_connection", + return_value="uuid123", ) - @patch("wifi_nmcli_test.turn_down_nm_connections") - @patch("wifi_nmcli_test.turn_up_connection") + @patch("wifi_nmcli_test.turn_down_nm_connections", new=MagicMock()) + @patch("wifi_nmcli_test.turn_up_connection", new=MagicMock()) + @patch("wifi_nmcli_test.device_rescan", new=MagicMock()) @patch( "wifi_nmcli_test.list_aps", return_value={ @@ -589,20 +558,15 @@ def test_main_open_no_aps_found( "TestSSID": {"Chan": "11", "Freq": "2462", "Signal": "80"}, }, ) + @patch("wifi_nmcli_test.open_connection", return_value=0) @patch( "wifi_nmcli_test.sys.argv", ["wifi_nmcli_test.py", "open", "wlan0", "TestSSID"], ) - @patch("wifi_nmcli_test.open_connection", return_value=0) - @patch("wifi_nmcli_test.device_rescan") def test_main_open_aps_found( self, list_aps_mock, - turn_up_connection_mock, - turn_down_nm_connections_mock, get_nm_activate_connection_mock, - delete_test_ap_ssid_connection_mock, mock_open_connection, - mock_device_rescan, ): main()