diff options
Diffstat (limited to 'src/core/tests/test-core.c')
| -rw-r--r-- | src/core/tests/test-core.c | 56 |
1 files changed, 51 insertions, 5 deletions
diff --git a/src/core/tests/test-core.c b/src/core/tests/test-core.c index 8296d745..e90cf6e9 100644 --- a/src/core/tests/test-core.c +++ b/src/core/tests/test-core.c @@ -302,7 +302,7 @@ test_nm_utils_log_connection_diff(void) g_object_set(nm_connection_get_setting_connection(connection2), NM_SETTING_CONNECTION_ID, "id2", - NM_SETTING_CONNECTION_MASTER, + NM_SETTING_CONNECTION_CONTROLLER, "master2", NULL); nm_utils_log_connection_diff(connection, @@ -2104,8 +2104,19 @@ do_test_stable_id_parse(const char *stable_id, NMUtilsStableType expected_stable_type, const char *expected_generated) { - gs_free char *generated = NULL; - NMUtilsStableType stable_type; + gs_free char *generated = NULL; + NMUtilsStableType stable_type; + char ssid_bin[] = "SSID(\202)"; + gs_unref_bytes GBytes *ssid = g_bytes_new_static(ssid_bin, sizeof(ssid_bin) - 1); + + while (TRUE) { + if (NM_STR_HAS_PREFIX(stable_id, "NO_SSID:")) { + stable_id += NM_STRLEN("NO_SSID:"); + nm_clear_pointer(&ssid, g_bytes_unref); + continue; + } + break; + } if (expected_stable_type == NM_UTILS_STABLE_TYPE_GENERATED) g_assert(expected_generated); @@ -2117,8 +2128,13 @@ do_test_stable_id_parse(const char *stable_id, else g_assert(stable_id); - stable_type = - nm_utils_stable_id_parse(stable_id, "_DEVICE", "_MAC", "_BOOT", "_CONNECTION", &generated); + stable_type = nm_utils_stable_id_parse(stable_id, + "_DEVICE", + "_MAC", + "_BOOT", + "_CONNECTION", + ssid, + &generated); g_assert_cmpint(expected_stable_type, ==, stable_type); @@ -2160,6 +2176,12 @@ test_stable_id_parse(void) _parse_generated("${${CONNECTION}", "${${CONNECTION}=11{_CONNECTION}"); _parse_generated("${CONNECTION}x", "${CONNECTION}=11{_CONNECTION}x"); _parse_generated("x${CONNECTION}", "x${CONNECTION}=11{_CONNECTION}"); + _parse_generated("x${CONNECTION}${NETWORK_SSID}", + "x${CONNECTION}=11{_CONNECTION}${NETWORK_SSID}=12{s:SSID(\\202)}"); + _parse_generated("NO_SSID:x${CONNECTION}${NETWORK_SSID}", + "x${CONNECTION}=11{_CONNECTION}${NETWORK_SSID}=13{c:_CONNECTION}"); + _parse_generated("${NETWORK_SSID}", "${NETWORK_SSID}=12{s:SSID(\\202)}"); + _parse_generated("NO_SSID:${NETWORK_SSID}", "${NETWORK_SSID}=13{c:_CONNECTION}"); _parse_generated("${BOOT}x", "${BOOT}=5{_BOOT}x"); _parse_generated("x${BOOT}", "x${BOOT}=5{_BOOT}"); _parse_generated("x${BOOT}${CONNECTION}", "x${BOOT}=5{_BOOT}${CONNECTION}=11{_CONNECTION}"); @@ -2169,6 +2191,30 @@ test_stable_id_parse(void) _parse_random("${RANDOM}"); _parse_random(" ${RANDOM}"); _parse_random("${BOOT}${RANDOM}"); + + { + gs_free char *str = NULL; + char ssid_bin[] = "foo\n"; + gs_unref_bytes GBytes *ssid = g_bytes_new_static(ssid_bin, sizeof(ssid_bin) - 1); + NMUtilsStableType stable_type; + + stable_type = nm_utils_stable_id_parse_network_ssid(ssid, "uuid", FALSE, &str); + + g_assert_cmpint(stable_type, ==, NM_UTILS_STABLE_TYPE_GENERATED); + g_assert_cmpstr(str, ==, "${NETWORK_SSID}=9{s:foo\\012}"); + + nm_clear_g_free(&str); + + stable_type = nm_utils_stable_id_parse_network_ssid(ssid, "uuid", TRUE, &str); + + g_assert_cmpint(stable_type, ==, NM_UTILS_STABLE_TYPE_GENERATED); + g_assert_cmpstr(str, ==, "wqLBg0FtOnCi7yYQKGDUj6CDixc"); + + nm_clear_g_free(&str); + + str = nm_utils_stable_id_generated_complete("${NETWORK_SSID}=9{s:foo\\012}"); + g_assert_cmpstr(str, ==, "wqLBg0FtOnCi7yYQKGDUj6CDixc"); + } } /*****************************************************************************/ |