From a5ea98005f1cd5815b91c47da6dade9f290c9a85 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Fri, 13 Mar 2015 14:32:55 +0100 Subject: test: print connections as keyfile on failure of nmtst_assert_connection_equals() If the assertion nmtst_assert_connection_equals() is about to fail, dump out the offending connections as keyfile. --- include/nm-test-utils.h | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/include/nm-test-utils.h b/include/nm-test-utils.h index 8ef156a588..ddea03745d 100644 --- a/include/nm-test-utils.h +++ b/include/nm-test-utils.h @@ -887,6 +887,24 @@ nmtst_assert_connection_equals (NMConnection *a, gboolean normalize_a, NMConnect __NMTST_LOG (g_message, ">>> differences in setting '%s.%s'", name, pname); } } + +#ifdef __NM_KEYFILE_INTERNAL_H__ + { + gs_unref_keyfile GKeyFile *kf_a = NULL, *kf_b = NULL; + gs_free char *str_a = NULL, *str_b = NULL; + + kf_a = nm_keyfile_write (a, NULL, NULL, NULL); + kf_b = nm_keyfile_write (b, NULL, NULL, NULL); + + if (kf_a) + str_a = g_key_file_to_data (kf_a, NULL, NULL); + if (kf_b) + str_b = g_key_file_to_data (kf_b, NULL, NULL); + + __NMTST_LOG (g_message, ">>> Connection A as kf (*WARNING: keyfile representation might not show the difference*):\n%s", str_a); + __NMTST_LOG (g_message, ">>> Connection B as kf (*WARNING: keyfile representation might not show the difference*):\n%s", str_b); + } +#endif } g_assert (compare); g_assert (!out_settings); -- cgit v1.2.1