fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-01-10 14:00:18 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

merge: branch 'bg/test-client-quotation'

Browse source 
test-client: fix quotation in expected message

https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/2269
This commit is contained in:
Íñigo Huguet 2025-09-08 10:47:37 +00:00
commit 57ea2cf612
2 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/libnm-client-impl/tests/test-nm-client.c
View file

@ -1432,13 +1432,13 @@ test_client_wait_shutdown(void)
nmtst_assert_success(dbus_connection, error);
for (i_run = 0; i_run < N_RUN; i_run++) {
gs_unref_object GCancellable *init_cancellable = g_cancellable_new();
gs_unref_object NMClient *nmc = NULL;
nm_auto_pop_gmaincontext GMainContext *client_context = NULL;
gboolean b;
gboolean context_integrated = FALSE;
gs_unref_object GCancellable *cancellable_1 = NULL;
GMainContext *ctx;
gs_unref_object GCancellable *init_cancellable = g_cancellable_new();
gs_unref_object NMClient *nmc = NULL;
nm_auto_pop_and_unref_gmaincontext GMainContext *client_context = NULL;
gboolean b;
gboolean context_integrated = FALSE;
gs_unref_object GCancellable *cancellable_1 = NULL;
GMainContext *ctx;
/* Choose a random context for the client. */
ctx = contexts->pdata[nmtst_get_rand_uint32() % contexts->len];

6
src/tests/client/test-client.py
View file

@ -2227,9 +2227,9 @@ class TestNmcli(unittest.TestCase):
extra_env=no_dbus_env,
replace_stderr=[
Util.ReplaceTextRegex(
# depending on glib version, it prints `%s', '%s', or “%s”.
# depending on libc version, it converts unicode to ? or *.
r"Key/Value pair 0, [`*?']invalid[*?'], in address element [`*?']very:invalid[*?'] does not contain an equal sign",
# Depending on glib version, it prints `%s', '%s', or “%s”.
# Some libc versions convert the multi-byte UTF-8 sequence to ? or *.
r"Key/Value pair 0, .*invalid.*, in address element .*very:invalid.* does not contain an equal sign",
"Key/Value pair 0, 'invalid', in address element 'very:invalid' does not contain an equal sign",
)
],