colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

platform/tests: workaround failure of nmtstp_assert_platform()

Browse Source
This commit is contained in:
Thomas Haller
2023-01-31 18:19:30 +01:00
parent 0347dc7ddc
commit 82e21a4906
3 changed files with 116 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

172
src/core/platform/tests/test-common.c
View File

@@ -911,13 +911,14 @@ _assert_platform_normalize_all(GPtrArray *arr)
return normalized; return normalized;
} }
static void static gboolean
_assert_platform_compare_arr(NMPObjectType obj_type, _assert_platform_compare_arr(NMPObjectType obj_type,
const char *detail_type, const char *detail_type,
GPtrArray *arr1, GPtrArray *arr1,
GPtrArray *arr2, GPtrArray *arr2,
gboolean normalized, gboolean normalized,
gboolean share_multi_idx) gboolean share_multi_idx,
gboolean do_assert)
{ {
const NMPClass *obj_class = nmp_class_from_type(obj_type); const NMPClass *obj_class = nmp_class_from_type(obj_type);
char sbuf1[NM_UTILS_TO_STRING_BUFFER_SIZE]; char sbuf1[NM_UTILS_TO_STRING_BUFFER_SIZE];
@@ -925,48 +926,64 @@ _assert_platform_compare_arr(NMPObjectType obj_type,
int idx; int idx;
int idx_pointer_comp = -1; int idx_pointer_comp = -1;
#define _fail_msg(do_assert, ...) \
G_STMT_START \
{ \
if (do_assert) { \
g_error(__VA_ARGS__); \
} else { \
_LOGW(__VA_ARGS__); \
return FALSE; \
} \
} \
G_STMT_END
for (idx = 0; TRUE; idx++) { for (idx = 0; TRUE; idx++) {
if (nm_g_ptr_array_len(arr1) == idx && nm_g_ptr_array_len(arr2) == idx) if (nm_g_ptr_array_len(arr1) == idx && nm_g_ptr_array_len(arr2) == idx)
break; break;
if (idx >= nm_g_ptr_array_len(arr1)) { if (idx >= nm_g_ptr_array_len(arr1)) {
_assert_platform_printarr(obj_type, arr1, arr2); _assert_platform_printarr(obj_type, arr1, arr2);
g_error("Comparing %s (%s) for platform fails. Platform now shows entry #%u which is " _fail_msg(do_assert,
"not in the cache but expected %s", "Comparing %s (%s) for platform fails. Platform now shows entry #%u which is "
obj_class->obj_type_name, "not in the cache but expected %s",
detail_type, obj_class->obj_type_name,
idx, detail_type,
nmp_object_to_string(arr2->pdata[idx], idx,
NMP_OBJECT_TO_STRING_ALL, nmp_object_to_string(arr2->pdata[idx],
sbuf1, NMP_OBJECT_TO_STRING_ALL,
sizeof(sbuf1))); sbuf1,
sizeof(sbuf1)));
} }
if (idx >= nm_g_ptr_array_len(arr2)) { if (idx >= nm_g_ptr_array_len(arr2)) {
_assert_platform_printarr(obj_type, arr1, arr2); _assert_platform_printarr(obj_type, arr1, arr2);
g_error("Comparing %s (%s) for platform fails. Platform has no more entry #%u which is " _fail_msg(
"still in the cache as %s", do_assert,
obj_class->obj_type_name, "Comparing %s (%s) for platform fails. Platform has no more entry #%u which is "
detail_type, "still in the cache as %s",
idx, obj_class->obj_type_name,
nmp_object_to_string(arr1->pdata[idx], detail_type,
NMP_OBJECT_TO_STRING_ALL, idx,
sbuf1, nmp_object_to_string(arr1->pdata[idx],
sizeof(sbuf1))); NMP_OBJECT_TO_STRING_ALL,
sbuf1,
sizeof(sbuf1)));
} }
if (!nmp_object_equal(arr1->pdata[idx], arr2->pdata[idx])) { if (!nmp_object_equal(arr1->pdata[idx], arr2->pdata[idx])) {
_assert_platform_printarr(obj_type, arr1, arr2); _assert_platform_printarr(obj_type, arr1, arr2);
g_error("Comparing %s (%s) for platform fails. Platform entry #%u is now %s but in " _fail_msg(do_assert,
"cache is %s", "Comparing %s (%s) for platform fails. Platform entry #%u is now %s but in "
obj_class->obj_type_name, "cache is %s",
detail_type, obj_class->obj_type_name,
idx, detail_type,
nmp_object_to_string(arr2->pdata[idx], idx,
NMP_OBJECT_TO_STRING_ALL, nmp_object_to_string(arr2->pdata[idx],
sbuf1, NMP_OBJECT_TO_STRING_ALL,
sizeof(sbuf1)), sbuf1,
nmp_object_to_string(arr1->pdata[idx], sizeof(sbuf1)),
NMP_OBJECT_TO_STRING_ALL, nmp_object_to_string(arr1->pdata[idx],
sbuf2, NMP_OBJECT_TO_STRING_ALL,
sizeof(sbuf2))); sbuf2,
sizeof(sbuf2)));
} }
if (!normalized && (share_multi_idx != (arr1->pdata[idx] == arr2->pdata[idx])) if (!normalized && (share_multi_idx != (arr1->pdata[idx] == arr2->pdata[idx]))
@@ -976,20 +993,23 @@ _assert_platform_compare_arr(NMPObjectType obj_type,
if (idx_pointer_comp != -1) { if (idx_pointer_comp != -1) {
_assert_platform_printarr(obj_type, arr1, arr2); _assert_platform_printarr(obj_type, arr1, arr2);
g_error("Comparing %s (%s) for platform fails for pointer comparison. Platform entry " _fail_msg(do_assert,
"#%u is now %s but in cache is %s", "Comparing %s (%s) for platform fails for pointer comparison. Platform entry "
obj_class->obj_type_name, "#%u is now %s but in cache is %s",
detail_type, obj_class->obj_type_name,
idx_pointer_comp, detail_type,
nmp_object_to_string(arr2->pdata[idx_pointer_comp], idx_pointer_comp,
NMP_OBJECT_TO_STRING_ALL, nmp_object_to_string(arr2->pdata[idx_pointer_comp],
sbuf1, NMP_OBJECT_TO_STRING_ALL,
sizeof(sbuf1)), sbuf1,
nmp_object_to_string(arr1->pdata[idx_pointer_comp], sizeof(sbuf1)),
NMP_OBJECT_TO_STRING_ALL, nmp_object_to_string(arr1->pdata[idx_pointer_comp],
sbuf2, NMP_OBJECT_TO_STRING_ALL,
sizeof(sbuf2))); sbuf2,
sizeof(sbuf2)));
} }
return TRUE;
} }
/*****************************************************************************/ /*****************************************************************************/
@@ -1211,8 +1231,8 @@ out:
return result; return result;
} }
void gboolean
nmtstp_assert_platform(NMPlatform *platform, guint32 obj_type_flags) nmtstp_check_platform_full(NMPlatform *platform, guint32 obj_type_flags, gboolean do_assert)
{ {
static const NMPObjectType obj_types[] = { static const NMPObjectType obj_types[] = {
NMP_OBJECT_TYPE_IP4_ADDRESS, NMP_OBJECT_TYPE_IP4_ADDRESS,
@@ -1275,7 +1295,14 @@ nmtstp_assert_platform(NMPlatform *platform, guint32 obj_type_flags)
g_ptr_array_sort(arr2, _assert_platform_sort_objs); g_ptr_array_sort(arr2, _assert_platform_sort_objs);
} }
_assert_platform_compare_arr(obj_type, "main", arr1, arr2, normalized, share_multi_idx); if (!_assert_platform_compare_arr(obj_type,
"main",
arr1,
arr2,
normalized,
share_multi_idx,
do_assert))
return FALSE;
if (NM_IN_SET(obj_type, NMP_OBJECT_TYPE_IP4_ROUTE, NMP_OBJECT_TYPE_IP6_ROUTE)) { if (NM_IN_SET(obj_type, NMP_OBJECT_TYPE_IP4_ROUTE, NMP_OBJECT_TYPE_IP6_ROUTE)) {
/* For routes, the WEAK_ID needs to be sorted and match the expected order. Check that. */ /* For routes, the WEAK_ID needs to be sorted and match the expected order. Check that. */
@@ -1309,12 +1336,14 @@ nmtstp_assert_platform(NMPlatform *platform, guint32 obj_type_flags)
arr2b_sorted = nm_g_ptr_array_new_clone(arr2b, NULL, NULL, NULL); arr2b_sorted = nm_g_ptr_array_new_clone(arr2b, NULL, NULL, NULL);
g_ptr_array_sort(arr1b_sorted, _assert_platform_sort_objs); g_ptr_array_sort(arr1b_sorted, _assert_platform_sort_objs);
g_ptr_array_sort(arr2b_sorted, _assert_platform_sort_objs); g_ptr_array_sort(arr2b_sorted, _assert_platform_sort_objs);
_assert_platform_compare_arr(obj_type, if (!_assert_platform_compare_arr(obj_type,
"weak-id-sorted", "weak-id-sorted",
arr1b_sorted, arr1b_sorted,
arr2b_sorted, arr2b_sorted,
normalized, normalized,
share_multi_idx); share_multi_idx,
do_assert))
return FALSE;
if (obj_type == NMP_OBJECT_TYPE_IP6_ROUTE) { if (obj_type == NMP_OBJECT_TYPE_IP6_ROUTE) {
/* For IPv6, the weak-ids are actually not sorted correctly. /* For IPv6, the weak-ids are actually not sorted correctly.
@@ -1348,12 +1377,14 @@ nmtstp_assert_platform(NMPlatform *platform, guint32 obj_type_flags)
*/ */
} else { } else {
/* Assert that also the original, not-sorted lists agree. */ /* Assert that also the original, not-sorted lists agree. */
_assert_platform_compare_arr(obj_type, if (!_assert_platform_compare_arr(obj_type,
"weak-id", "weak-id",
arr1b, arr1b,
arr2b, arr2b,
normalized, normalized,
share_multi_idx); share_multi_idx,
do_assert))
return FALSE;
} }
for (i = 0; i < arr1b->len; i++) { for (i = 0; i < arr1b->len; i++) {
@@ -1374,6 +1405,25 @@ nmtstp_assert_platform(NMPlatform *platform, guint32 obj_type_flags)
_LOGD("assert-platform: done"); _LOGD("assert-platform: done");
g_assert_cmpint(obj_type_flags, ==, 0u); g_assert_cmpint(obj_type_flags, ==, 0u);
return TRUE;
}
void
nmtstp_check_platform(NMPlatform *platform, guint32 obj_type_flags)
{
if (!nmtstp_check_platform_full(platform, obj_type_flags, FALSE)) {
/* It's unclear why this failure sometimes happens. It happens
* on gitlab-ci on Ubuntu/Debian(??).
*
* Retrying shortly after seems to avoid it. */
g_usleep(20 * 1000);
nm_platform_process_events(platform);
nmtstp_run_command("ip route");
nm_platform_process_events(platform);
nmtstp_check_platform_full(platform, obj_type_flags, TRUE);
}
} }
/*****************************************************************************/ /*****************************************************************************/

5
src/core/platform/tests/test-common.h
View File

@@ -139,7 +139,10 @@ int nmtstp_run_command(const char *format, ...) _nm_printf(1, 2);
/*****************************************************************************/ /*****************************************************************************/
void nmtstp_assert_platform(NMPlatform *platform, guint32 obj_type_flags); gboolean
nmtstp_check_platform_full(NMPlatform *platform, guint32 obj_type_flags, gboolean do_assert);
void nmtstp_check_platform(NMPlatform *platform, guint32 obj_type_flags);
/*****************************************************************************/ /*****************************************************************************/

2
src/core/platform/tests/test-route.c
View File

@@ -2367,7 +2367,7 @@ done:
nm_platform_process_events(platform); nm_platform_process_events(platform);
if (!is_test_quick || (i_run + 1 == N_RUN) || nmtst_get_rand_one_case_in(5)) { if (!is_test_quick || (i_run + 1 == N_RUN) || nmtst_get_rand_one_case_in(5)) {
nmtstp_assert_platform( nmtstp_check_platform(
platform, platform,
nmtst_get_rand_one_case_in(5) nmtst_get_rand_one_case_in(5)
? 0u ? 0u