fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2025-12-25 18:50:07 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

ifcfg-rh/tests: evalute environment for $NMTST_IFCFG_RH_UPDATE_EXPECTED only once

Browse source 
It just seems ugly to call g_getenv() repeatedly. Environment variables
must not change (in a multi-threaded program after other threads start),
so determine the mode once and cache it.
This commit is contained in:
Thomas Haller 2021-06-24 17:49:57 +02:00
parent d391f20730
commit 1ae6719cf1
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728
1 changed files with 24 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
src/core/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c
View file

@ -181,8 +181,20 @@ _assert_expected_content(NMConnection *connection, const char *filename, const c
} }
if (len_expectd != len_written || memcmp(content_expectd, content_written, len_expectd) != 0) { if (len_expectd != len_written || memcmp(content_expectd, content_written, len_expectd) != 0) {
if (g_getenv("NMTST_IFCFG_RH_UPDATE_EXPECTED") static int rewrite_static = 0;
|| nm_streq0(g_getenv("NM_TEST_REGENERATE"), "1")) { int rewrite;
rewrite = g_atomic_int_get(&rewrite_static);
if (G_UNLIKELY(rewrite == 0)) {
rewrite = (g_getenv("NMTST_IFCFG_RH_UPDATE_EXPECTED")
|| nm_streq0(g_getenv("NM_TEST_REGENERATE"), "1"))
? -1
: 1;
if (!g_atomic_int_compare_and_exchange(&rewrite_static, 0, rewrite))
g_assert_not_reached();
}
if (rewrite > 0) {
if (uuid) { if (uuid) {
gs_free char *search = g_strdup_printf("UUID=%s\n", uuid); gs_free char *search = g_strdup_printf("UUID=%s\n", uuid);
const char * s; const char * s;
@ -210,15 +222,16 @@ _assert_expected_content(NMConnection *connection, const char *filename, const c
success = g_file_set_contents(expected, content_written, len_written, &error); success = g_file_set_contents(expected, content_written, len_written, &error);
nmtst_assert_success(success, error); nmtst_assert_success(success, error);
} else { } else {
g_error("The content of \"%s\" (%zu) differs from \"%s\" (%zu). Set " g_error(
"NMTST_IFCFG_RH_UPDATE_EXPECTED=yes to update the files " "The content of \"%s\" (%zu) differs from \"%s\" (%zu). Set "
"inplace\n\n>>>%s<<<\n\n>>>%s<<<\n", "NMTST_IFCFG_RH_UPDATE_EXPECTED=yes (or NM_TEST_REGENERATE=1) to update the files "
filename, "inplace\n\n>>>%s<<<\n\n>>>%s<<<\n",
len_written, filename,
expected, len_written,
len_expectd, expected,
content_written, len_expectd,
content_expectd); content_written,
content_expectd);
} }
} }
} }