diff options
Diffstat (limited to 'src/settings/plugins/keyfile')
| -rw-r--r-- | src/settings/plugins/keyfile/plugin.c | 5 | ||||
| -rw-r--r-- | src/settings/plugins/keyfile/tests/test-keyfile.c | 146 | ||||
| -rw-r--r-- | src/settings/plugins/keyfile/utils.h | 2 |
3 files changed, 76 insertions, 77 deletions
diff --git a/src/settings/plugins/keyfile/plugin.c b/src/settings/plugins/keyfile/plugin.c index 29a1141b..6003c745 100644 --- a/src/settings/plugins/keyfile/plugin.c +++ b/src/settings/plugins/keyfile/plugin.c @@ -404,10 +404,9 @@ read_connections (NMSettingsPlugin *config) dir = g_dir_open (nm_keyfile_plugin_get_path (), 0, &error); if (!dir) { - nm_log_warn (LOGD_SETTINGS, "keyfile: cannot read directory '%s': (%d) %s", + nm_log_warn (LOGD_SETTINGS, "keyfile: cannot read directory '%s': %s", nm_keyfile_plugin_get_path (), - error ? error->code : -1, - error && error->message ? error->message : "(unknown)"); + error->message); g_clear_error (&error); return; } diff --git a/src/settings/plugins/keyfile/tests/test-keyfile.c b/src/settings/plugins/keyfile/tests/test-keyfile.c index c1b79ef7..7b66e198 100644 --- a/src/settings/plugins/keyfile/tests/test-keyfile.c +++ b/src/settings/plugins/keyfile/tests/test-keyfile.c @@ -88,33 +88,33 @@ test_read_valid_wired_connection (void) char expected_mac_address[ETH_ALEN] = { 0x00, 0x11, 0x22, 0x33, 0x44, 0x55 }; gboolean success; - g_test_expect_message ("NetworkManager", G_LOG_LEVEL_MESSAGE, + g_test_expect_message ("NetworkManager", G_LOG_LEVEL_INFO, "*ipv4.addresses:*semicolon at the end*addresses1*"); - g_test_expect_message ("NetworkManager", G_LOG_LEVEL_MESSAGE, + g_test_expect_message ("NetworkManager", G_LOG_LEVEL_INFO, "*ipv4.addresses:*semicolon at the end*addresses2*"); - g_test_expect_message ("NetworkManager", G_LOG_LEVEL_WARNING, + g_test_expect_message ("NetworkManager", G_LOG_LEVEL_MESSAGE, "*missing prefix length*address4*"); - g_test_expect_message ("NetworkManager", G_LOG_LEVEL_WARNING, - "*missing prefix length*address5*"); g_test_expect_message ("NetworkManager", G_LOG_LEVEL_MESSAGE, + "*missing prefix length*address5*"); + g_test_expect_message ("NetworkManager", G_LOG_LEVEL_INFO, "*ipv4.routes*semicolon at the end*routes2*"); - g_test_expect_message ("NetworkManager", G_LOG_LEVEL_MESSAGE, + g_test_expect_message ("NetworkManager", G_LOG_LEVEL_INFO, "*ipv4.routes*semicolon at the end*routes3*"); - g_test_expect_message ("NetworkManager", G_LOG_LEVEL_MESSAGE, + g_test_expect_message ("NetworkManager", G_LOG_LEVEL_INFO, "*ipv4.routes*semicolon at the end*routes5*"); - g_test_expect_message ("NetworkManager", G_LOG_LEVEL_MESSAGE, + g_test_expect_message ("NetworkManager", G_LOG_LEVEL_INFO, "*ipv4.routes*semicolon at the end*routes8*"); - g_test_expect_message ("NetworkManager", G_LOG_LEVEL_WARNING, - "*missing prefix length*address4*"); g_test_expect_message ("NetworkManager", G_LOG_LEVEL_MESSAGE, + "*missing prefix length*address4*"); + g_test_expect_message ("NetworkManager", G_LOG_LEVEL_INFO, "*ipv6.address*semicolon at the end*address5*"); - g_test_expect_message ("NetworkManager", G_LOG_LEVEL_WARNING, - "*missing prefix length*address5*"); g_test_expect_message ("NetworkManager", G_LOG_LEVEL_MESSAGE, + "*missing prefix length*address5*"); + g_test_expect_message ("NetworkManager", G_LOG_LEVEL_INFO, "*ipv6.address*semicolon at the end*address7*"); - g_test_expect_message ("NetworkManager", G_LOG_LEVEL_MESSAGE, + g_test_expect_message ("NetworkManager", G_LOG_LEVEL_INFO, "*ipv6.routes*semicolon at the end*routes1*"); - g_test_expect_message ("NetworkManager", G_LOG_LEVEL_MESSAGE, + g_test_expect_message ("NetworkManager", G_LOG_LEVEL_INFO, "*ipv6.route*semicolon at the end*route6*"); connection = nm_keyfile_plugin_connection_from_file (TEST_KEYFILES_DIR "/Test_Wired_Connection", NULL); g_test_assert_expected_messages (); @@ -537,11 +537,11 @@ test_read_wired_mac_case (void) char expected_mac_address[ETH_ALEN] = { 0x00, 0x11, 0xaa, 0xbb, 0xcc, 0x55 }; gboolean success; - g_test_expect_message ("NetworkManager", G_LOG_LEVEL_MESSAGE, + g_test_expect_message ("NetworkManager", G_LOG_LEVEL_INFO, "*ipv4.addresses*semicolon at the end*addresses1*"); - g_test_expect_message ("NetworkManager", G_LOG_LEVEL_MESSAGE, + g_test_expect_message ("NetworkManager", G_LOG_LEVEL_INFO, "*ipv4.addresses*semicolon at the end*addresses2*"); - g_test_expect_message ("NetworkManager", G_LOG_LEVEL_MESSAGE, + g_test_expect_message ("NetworkManager", G_LOG_LEVEL_INFO, "*ipv6.routes*semicolon at the end*routes1*"); connection = nm_keyfile_plugin_connection_from_file (TEST_KEYFILES_DIR "/Test_Wired_Connection_MAC_Case", NULL); g_test_assert_expected_messages (); @@ -1513,10 +1513,10 @@ test_read_wired_8021x_tls_blob_connection (void) gboolean success; GBytes *blob; - g_test_expect_message ("NetworkManager", G_LOG_LEVEL_WARNING, - "*<warn> keyfile: 802-1x.client-cert: certificate or key file '/CASA/dcbw/Desktop/certinfra/client.pem' does not exist*"); - g_test_expect_message ("NetworkManager", G_LOG_LEVEL_WARNING, - "*<warn> keyfile: 802-1x.private-key: certificate or key file '/CASA/dcbw/Desktop/certinfra/client.pem' does not exist*"); + g_test_expect_message ("NetworkManager", G_LOG_LEVEL_MESSAGE, + "*<warn> * keyfile: 802-1x.client-cert: certificate or key file '/CASA/dcbw/Desktop/certinfra/client.pem' does not exist*"); + g_test_expect_message ("NetworkManager", G_LOG_LEVEL_MESSAGE, + "*<warn> * keyfile: 802-1x.private-key: certificate or key file '/CASA/dcbw/Desktop/certinfra/client.pem' does not exist*"); connection = nm_keyfile_plugin_connection_from_file (TEST_KEYFILES_DIR "/Test_Wired_TLS_Blob", &error); g_assert_no_error (error); g_assert (connection); @@ -1576,7 +1576,7 @@ test_read_wired_8021x_tls_bad_path_connection (void) char *tmp2; gboolean success; - g_test_expect_message ("NetworkManager", G_LOG_LEVEL_WARNING, + g_test_expect_message ("NetworkManager", G_LOG_LEVEL_MESSAGE, "*does not exist*"); connection = nm_keyfile_plugin_connection_from_file (TEST_KEYFILES_DIR "/Test_Wired_TLS_Path_Missing", &error); g_test_assert_expected_messages (); @@ -1631,12 +1631,12 @@ test_read_wired_8021x_tls_old_connection (void) const char *tmp; gboolean success; - g_test_expect_message ("NetworkManager", G_LOG_LEVEL_WARNING, - "*<warn> keyfile: 802-1x.ca-cert: certificate or key file '/CASA/dcbw/Desktop/certinfra/CA/eaptest_ca_cert.pem' does not exist*"); - g_test_expect_message ("NetworkManager", G_LOG_LEVEL_WARNING, - "*<warn> keyfile: 802-1x.client-cert: certificate or key file '/CASA/dcbw/Desktop/certinfra/client.pem' does not exist*"); - g_test_expect_message ("NetworkManager", G_LOG_LEVEL_WARNING, - "*<warn> keyfile: 802-1x.private-key: certificate or key file '/CASA/dcbw/Desktop/certinfra/client.pem' does not exist*"); + g_test_expect_message ("NetworkManager", G_LOG_LEVEL_MESSAGE, + "*<warn> * keyfile: 802-1x.ca-cert: certificate or key file '/CASA/dcbw/Desktop/certinfra/CA/eaptest_ca_cert.pem' does not exist*"); + g_test_expect_message ("NetworkManager", G_LOG_LEVEL_MESSAGE, + "*<warn> * keyfile: 802-1x.client-cert: certificate or key file '/CASA/dcbw/Desktop/certinfra/client.pem' does not exist*"); + g_test_expect_message ("NetworkManager", G_LOG_LEVEL_MESSAGE, + "*<warn> * keyfile: 802-1x.private-key: certificate or key file '/CASA/dcbw/Desktop/certinfra/client.pem' does not exist*"); connection = nm_keyfile_plugin_connection_from_file (TEST_KEYFILES_DIR "/Test_Wired_TLS_Old", &error); g_assert_no_error (error); g_assert (connection); @@ -3000,71 +3000,71 @@ int main (int argc, char **argv) nmtst_init_assert_logging (&argc, &argv, "INFO", "DEFAULT"); /* The tests */ - g_test_add_func ("/keyfile/test_read_valid_wired_connection ", test_read_valid_wired_connection); - g_test_add_func ("/keyfile/test_write_wired_connection ", test_write_wired_connection); + g_test_add_func ("/keyfile/test_read_valid_wired_connection", test_read_valid_wired_connection); + g_test_add_func ("/keyfile/test_write_wired_connection", test_write_wired_connection); - g_test_add_func ("/keyfile/test_read_ip6_wired_connection ", test_read_ip6_wired_connection); - g_test_add_func ("/keyfile/test_write_ip6_wired_connection ", test_write_ip6_wired_connection); + g_test_add_func ("/keyfile/test_read_ip6_wired_connection", test_read_ip6_wired_connection); + g_test_add_func ("/keyfile/test_write_ip6_wired_connection", test_write_ip6_wired_connection); - g_test_add_func ("/keyfile/test_read_wired_mac_case ", test_read_wired_mac_case); - g_test_add_func ("/keyfile/test_read_mac_old_format ", test_read_mac_old_format); - g_test_add_func ("/keyfile/test_read_mac_ib_old_format ", test_read_mac_ib_old_format); + g_test_add_func ("/keyfile/test_read_wired_mac_case", test_read_wired_mac_case); + g_test_add_func ("/keyfile/test_read_mac_old_format", test_read_mac_old_format); + g_test_add_func ("/keyfile/test_read_mac_ib_old_format", test_read_mac_ib_old_format); - g_test_add_func ("/keyfile/test_read_valid_wireless_connection ", test_read_valid_wireless_connection); - g_test_add_func ("/keyfile/test_write_wireless_connection ", test_write_wireless_connection); + g_test_add_func ("/keyfile/test_read_valid_wireless_connection", test_read_valid_wireless_connection); + g_test_add_func ("/keyfile/test_write_wireless_connection", test_write_wireless_connection); - g_test_add_func ("/keyfile/test_read_string_ssid ", test_read_string_ssid); - g_test_add_func ("/keyfile/test_write_string_ssid ", test_write_string_ssid); + g_test_add_func ("/keyfile/test_read_string_ssid", test_read_string_ssid); + g_test_add_func ("/keyfile/test_write_string_ssid", test_write_string_ssid); - g_test_add_func ("/keyfile/test_read_intlist_ssid ", test_read_intlist_ssid); - g_test_add_func ("/keyfile/test_write_intlist_ssid ", test_write_intlist_ssid); + g_test_add_func ("/keyfile/test_read_intlist_ssid", test_read_intlist_ssid); + g_test_add_func ("/keyfile/test_write_intlist_ssid", test_write_intlist_ssid); - g_test_add_func ("/keyfile/test_read_intlike_ssid ", test_read_intlike_ssid); - g_test_add_func ("/keyfile/test_write_intlike_ssid ", test_write_intlike_ssid); + g_test_add_func ("/keyfile/test_read_intlike_ssid", test_read_intlike_ssid); + g_test_add_func ("/keyfile/test_write_intlike_ssid", test_write_intlike_ssid); - g_test_add_func ("/keyfile/test_read_intlike_ssid_2 ", test_read_intlike_ssid_2); - g_test_add_func ("/keyfile/test_write_intlike_ssid_2 ", test_write_intlike_ssid_2); + g_test_add_func ("/keyfile/test_read_intlike_ssid_2", test_read_intlike_ssid_2); + g_test_add_func ("/keyfile/test_write_intlike_ssid_2", test_write_intlike_ssid_2); - g_test_add_func ("/keyfile/test_read_bt_dun_connection ", test_read_bt_dun_connection); - g_test_add_func ("/keyfile/test_write_bt_dun_connection ", test_write_bt_dun_connection); + g_test_add_func ("/keyfile/test_read_bt_dun_connection", test_read_bt_dun_connection); + g_test_add_func ("/keyfile/test_write_bt_dun_connection", test_write_bt_dun_connection); - g_test_add_func ("/keyfile/test_read_gsm_connection ", test_read_gsm_connection); - g_test_add_func ("/keyfile/test_write_gsm_connection ", test_write_gsm_connection); + g_test_add_func ("/keyfile/test_read_gsm_connection", test_read_gsm_connection); + g_test_add_func ("/keyfile/test_write_gsm_connection", test_write_gsm_connection); - g_test_add_func ("/keyfile/test_read_wired_8021x_tls_blob_connection ", test_read_wired_8021x_tls_blob_connection); - g_test_add_func ("/keyfile/test_read_wired_8021x_tls_bad_path_connection ", test_read_wired_8021x_tls_bad_path_connection); + g_test_add_func ("/keyfile/test_read_wired_8021x_tls_blob_connection", test_read_wired_8021x_tls_blob_connection); + g_test_add_func ("/keyfile/test_read_wired_8021x_tls_bad_path_connection", test_read_wired_8021x_tls_bad_path_connection); - g_test_add_func ("/keyfile/test_read_wired_8021x_tls_old_connection ", test_read_wired_8021x_tls_old_connection); - g_test_add_func ("/keyfile/test_read_wired_8021x_tls_new_connection ", test_read_wired_8021x_tls_new_connection); - g_test_add_func ("/keyfile/test_write_wired_8021x_tls_connection_path ", test_write_wired_8021x_tls_connection_path); - g_test_add_func ("/keyfile/test_write_wired_8021x_tls_connection_blob ", test_write_wired_8021x_tls_connection_blob); + g_test_add_func ("/keyfile/test_read_wired_8021x_tls_old_connection", test_read_wired_8021x_tls_old_connection); + g_test_add_func ("/keyfile/test_read_wired_8021x_tls_new_connection", test_read_wired_8021x_tls_new_connection); + g_test_add_func ("/keyfile/test_write_wired_8021x_tls_connection_path", test_write_wired_8021x_tls_connection_path); + g_test_add_func ("/keyfile/test_write_wired_8021x_tls_connection_blob", test_write_wired_8021x_tls_connection_blob); - g_test_add_func ("/keyfile/test_read_infiniband_connection ", test_read_infiniband_connection); - g_test_add_func ("/keyfile/test_write_infiniband_connection ", test_write_infiniband_connection); + g_test_add_func ("/keyfile/test_read_infiniband_connection", test_read_infiniband_connection); + g_test_add_func ("/keyfile/test_write_infiniband_connection", test_write_infiniband_connection); - g_test_add_func ("/keyfile/test_read_bridge_main ", test_read_bridge_main); - g_test_add_func ("/keyfile/test_write_bridge_main ", test_write_bridge_main); - g_test_add_func ("/keyfile/test_read_bridge_component ", test_read_bridge_component); - g_test_add_func ("/keyfile/test_write_bridge_component ", test_write_bridge_component); + g_test_add_func ("/keyfile/test_read_bridge_main", test_read_bridge_main); + g_test_add_func ("/keyfile/test_write_bridge_main", test_write_bridge_main); + g_test_add_func ("/keyfile/test_read_bridge_component", test_read_bridge_component); + g_test_add_func ("/keyfile/test_write_bridge_component", test_write_bridge_component); - g_test_add_func ("/keyfile/test_read_new_wired_group_name ", test_read_new_wired_group_name); - g_test_add_func ("/keyfile/test_write_new_wired_group_name ", test_write_new_wired_group_name); - g_test_add_func ("/keyfile/test_read_new_wireless_group_names ", test_read_new_wireless_group_names); - g_test_add_func ("/keyfile/test_write_new_wireless_group_names ", test_write_new_wireless_group_names); + g_test_add_func ("/keyfile/test_read_new_wired_group_name", test_read_new_wired_group_name); + g_test_add_func ("/keyfile/test_write_new_wired_group_name", test_write_new_wired_group_name); + g_test_add_func ("/keyfile/test_read_new_wireless_group_names", test_read_new_wireless_group_names); + g_test_add_func ("/keyfile/test_write_new_wireless_group_names", test_write_new_wireless_group_names); - g_test_add_func ("/keyfile/test_read_missing_vlan_setting ", test_read_missing_vlan_setting); - g_test_add_func ("/keyfile/test_read_missing_vlan_flags ", test_read_missing_vlan_flags); - g_test_add_func ("/keyfile/test_read_missing_id_uuid ", test_read_missing_id_uuid); + g_test_add_func ("/keyfile/test_read_missing_vlan_setting", test_read_missing_vlan_setting); + g_test_add_func ("/keyfile/test_read_missing_vlan_flags", test_read_missing_vlan_flags); + g_test_add_func ("/keyfile/test_read_missing_id_uuid", test_read_missing_id_uuid); g_test_add_func ("/keyfile/test_read_minimal", test_read_minimal); g_test_add_func ("/keyfile/test_read_minimal_slave", test_read_minimal_slave); - g_test_add_func ("/keyfile/test_read_enum_property ", test_read_enum_property); - g_test_add_func ("/keyfile/test_write_enum_property ", test_write_enum_property); - g_test_add_func ("/keyfile/test_read_flags_property ", test_read_flags_property); - g_test_add_func ("/keyfile/test_write_flags_property ", test_write_flags_property); + g_test_add_func ("/keyfile/test_read_enum_property", test_read_enum_property); + g_test_add_func ("/keyfile/test_write_enum_property", test_write_enum_property); + g_test_add_func ("/keyfile/test_read_flags_property", test_read_flags_property); + g_test_add_func ("/keyfile/test_write_flags_property", test_write_flags_property); - g_test_add_func ("/keyfile/test_nm_keyfile_plugin_utils_escape_filename ", test_nm_keyfile_plugin_utils_escape_filename); + g_test_add_func ("/keyfile/test_nm_keyfile_plugin_utils_escape_filename", test_nm_keyfile_plugin_utils_escape_filename); return g_test_run (); } diff --git a/src/settings/plugins/keyfile/utils.h b/src/settings/plugins/keyfile/utils.h index 0b2b6f4e..c18fb2bc 100644 --- a/src/settings/plugins/keyfile/utils.h +++ b/src/settings/plugins/keyfile/utils.h @@ -27,7 +27,7 @@ #define KEYFILE_PLUGIN_NAME "keyfile" #define KEYFILE_PLUGIN_INFO "(c) 2007 - 2015 Red Hat, Inc. To report bugs please use the NetworkManager mailing list." -#define NM_KEYFILE_CONNECTION_LOG_PATH(path) str_if_set (path,"in-memory") +#define NM_KEYFILE_CONNECTION_LOG_PATH(path) ((path) ?: "in-memory") #define NM_KEYFILE_CONNECTION_LOG_FMT "%s (%s,\"%s\")" #define NM_KEYFILE_CONNECTION_LOG_ARG(con) NM_KEYFILE_CONNECTION_LOG_PATH (nm_settings_connection_get_filename ((NMSettingsConnection *) (con))), nm_connection_get_uuid ((NMConnection *) (con)), nm_connection_get_id ((NMConnection *) (con)) #define NM_KEYFILE_CONNECTION_LOG_FMTD "%s (%s,\"%s\",%p)" |