Skip to content

Commit 7b0b989

Browse files
committed
netplan apply function does not return boolean anymore
Fix #1674
1 parent 0253a5e commit 7b0b989

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

providers/base/tests/test_wifi_client_test_netplan.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -822,7 +822,6 @@ def test_main_success(
822822
mock_renderer.return_value = "networkd"
823823
mock_wait_routable.return_value = True
824824
mock_ping.return_value = True
825-
mock_apply.return_value = True
826825

827826
# Execute
828827
main()
@@ -875,7 +874,7 @@ def test_main_apply_config_failure(
875874
mock_args.renderer = "networkd"
876875
mock_parse_args.return_value = mock_args
877876
mock_renderer.return_value = "networkd"
878-
mock_apply.return_value = False
877+
mock_apply.side_effect = SystemExit("ERROR: failed netplan apply call")
879878

880879
# Execute and Assert
881880
with self.assertRaises(SystemExit):
@@ -921,7 +920,6 @@ def test_main_ping_test_failure(
921920
mock_parse_args.return_value = mock_args
922921
mock_renderer.return_value = "networkd"
923922
mock_wait_routable.return_value = True
924-
mock_apply.return_value = True
925923
mock_ping.return_value = False
926924

927925
# Execute and Assert
@@ -930,5 +928,6 @@ def test_main_ping_test_failure(
930928

931929
self.assertEqual(mock_delete.call_count, 1)
932930
self.assertEqual(mock_restore.call_count, 1)
931+
self.assertEqual(mock_apply.call_count, 2)
933932
self.assertEqual(mock_print_journal.call_count, 1)
934933
mock_ping.assert_called_once_with("wlan0", "networkd")

0 commit comments

Comments
 (0)