diff options
Diffstat (limited to 'src/supplicant-manager/tests/test-supplicant-config.c')
| -rw-r--r-- | src/supplicant-manager/tests/test-supplicant-config.c | 52 |
1 files changed, 41 insertions, 11 deletions
diff --git a/src/supplicant-manager/tests/test-supplicant-config.c b/src/supplicant-manager/tests/test-supplicant-config.c index 15be2ba8..bd532b24 100644 --- a/src/supplicant-manager/tests/test-supplicant-config.c +++ b/src/supplicant-manager/tests/test-supplicant-config.c @@ -30,12 +30,11 @@ #include <sys/types.h> #include <sys/stat.h> -#include <dbus/dbus-glib.h> - #include "nm-core-internal.h" #include "nm-supplicant-config.h" #include "nm-supplicant-settings-verify.h" +#include "nm-default.h" #include "nm-test-utils.h" @@ -159,12 +158,19 @@ test_wifi_open (void) "*added 'bssid' value '11:22:33:44:55:66'*"); g_test_expect_message ("NetworkManager", G_LOG_LEVEL_MESSAGE, "*added 'freq_list' value *"); - g_assert (nm_supplicant_config_add_setting_wireless (config, s_wifi, 0)); + g_assert (nm_supplicant_config_add_setting_wireless (config, + s_wifi, + 0, + NM_SUPPLICANT_FEATURE_UNKNOWN, + NM_SETTING_MAC_RANDOMIZATION_DEFAULT, + &error)); + g_assert_no_error (error); g_test_assert_expected_messages (); g_test_expect_message ("NetworkManager", G_LOG_LEVEL_MESSAGE, "*added 'key_mgmt' value 'NONE'"); - g_assert (nm_supplicant_config_add_no_security (config)); + g_assert (nm_supplicant_config_add_no_security (config, &error)); + g_assert_no_error (error); g_test_assert_expected_messages (); config_dict = nm_supplicant_config_to_variant (config); @@ -257,7 +263,13 @@ test_wifi_wep_key (const char *detail, "*added 'bssid' value '11:22:33:44:55:66'*"); g_test_expect_message ("NetworkManager", G_LOG_LEVEL_MESSAGE, "*added 'freq_list' value *"); - g_assert (nm_supplicant_config_add_setting_wireless (config, s_wifi, 0)); + g_assert (nm_supplicant_config_add_setting_wireless (config, + s_wifi, + 0, + NM_SUPPLICANT_FEATURE_UNKNOWN, + NM_SETTING_MAC_RANDOMIZATION_DEFAULT, + &error)); + g_assert_no_error (error); g_test_assert_expected_messages (); g_test_expect_message ("NetworkManager", G_LOG_LEVEL_MESSAGE, @@ -270,7 +282,9 @@ test_wifi_wep_key (const char *detail, s_wsec, NULL, "376aced7-b28c-46be-9a62-fcdf072571da", - 1500)); + 1500, + &error)); + g_assert_no_error (error); g_test_assert_expected_messages (); config_dict = nm_supplicant_config_to_variant (config); @@ -394,7 +408,13 @@ test_wifi_wpa_psk (const char *detail, "*added 'bssid' value '11:22:33:44:55:66'*"); g_test_expect_message ("NetworkManager", G_LOG_LEVEL_MESSAGE, "*added 'freq_list' value *"); - g_assert (nm_supplicant_config_add_setting_wireless (config, s_wifi, 0)); + g_assert (nm_supplicant_config_add_setting_wireless (config, + s_wifi, + 0, + NM_SUPPLICANT_FEATURE_UNKNOWN, + NM_SETTING_MAC_RANDOMIZATION_DEFAULT, + &error)); + g_assert_no_error (error); g_test_assert_expected_messages (); g_test_expect_message ("NetworkManager", G_LOG_LEVEL_MESSAGE, @@ -411,7 +431,9 @@ test_wifi_wpa_psk (const char *detail, s_wsec, NULL, "376aced7-b28c-46be-9a62-fcdf072571da", - 1500)); + 1500, + &error)); + g_assert_no_error (error); g_test_assert_expected_messages (); config_dict = nm_supplicant_config_to_variant (config); @@ -533,7 +555,13 @@ test_wifi_eap (void) "*added 'bssid' value '11:22:33:44:55:66'*"); g_test_expect_message ("NetworkManager", G_LOG_LEVEL_MESSAGE, "*added 'freq_list' value *"); - g_assert (nm_supplicant_config_add_setting_wireless (config, s_wifi, 0)); + g_assert (nm_supplicant_config_add_setting_wireless (config, + s_wifi, + 0, + NM_SUPPLICANT_FEATURE_UNKNOWN, + NM_SETTING_MAC_RANDOMIZATION_DEFAULT, + &error)); + g_assert_no_error (error); g_test_assert_expected_messages (); g_test_expect_message ("NetworkManager", G_LOG_LEVEL_MESSAGE, @@ -560,7 +588,9 @@ test_wifi_eap (void) s_wsec, s_8021x, "d5b488af-9cab-41ed-bad4-97709c58430f", - mtu)); + mtu, + &error)); + g_assert_no_error (error); g_test_assert_expected_messages (); config_dict = nm_supplicant_config_to_variant (config); @@ -581,7 +611,7 @@ NMTST_DEFINE (); int main (int argc, char **argv) { - nmtst_init (&argc, &argv, TRUE); + nmtst_init_assert_logging (&argc, &argv, "INFO", "DEFAULT"); g_test_add_func ("/supplicant-config/wifi-open", test_wifi_open); g_test_add_func ("/supplicant-config/wifi-wep", test_wifi_wep); |