diff options
| author | Thomas Haller <thaller@redhat.com> | 2015-03-13 14:32:39 +0100 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2015-03-20 13:19:20 +0100 |
| commit | 3790d8db2e642c76188f740bfccf1f939c95115f (patch) | |
| tree | 990d83ae3d038e17c064005863cf96eae0916e36 | |
| parent | 94cc7ca4f8f9cc97f4ff03a1fc7f6fa414da6038 (diff) | |
| download | NetworkManager-3790d8db2e642c76188f740bfccf1f939c95115f.tar.gz | |
test: fix printing error in nmtst_assert_connection_equals()
| -rw-r--r-- | include/nm-test-utils.h | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/include/nm-test-utils.h b/include/nm-test-utils.h index 4a07ecdf49..8ef156a588 100644 --- a/include/nm-test-utils.h +++ b/include/nm-test-utils.h @@ -871,18 +871,21 @@ nmtst_assert_connection_equals (NMConnection *a, gboolean normalize_a, NMConnect b = b2 = nmtst_connection_duplicate_and_normalize (b); compare = nm_connection_diff (a, b, NM_SETTING_COMPARE_FLAG_EXACT, &out_settings); - if (!compare && out_settings) { + if (!compare || out_settings) { const char *name, *pname; GHashTable *setting; GHashTableIter iter, iter2; - g_hash_table_iter_init (&iter, out_settings); - while (g_hash_table_iter_next (&iter, (gpointer *) &name, (gpointer *) &setting)) { - __NMTST_LOG (g_message, ">>> differences in setting '%s':", name); + __NMTST_LOG (g_message, ">>> ASSERTION nmtst_assert_connection_equals() fails"); + if (out_settings) { + g_hash_table_iter_init (&iter, out_settings); + while (g_hash_table_iter_next (&iter, (gpointer *) &name, (gpointer *) &setting)) { + __NMTST_LOG (g_message, ">>> differences in setting '%s':", name); - g_hash_table_iter_init (&iter2, out_settings); - while (g_hash_table_iter_next (&iter2, (gpointer *) &pname, NULL)) - __NMTST_LOG (g_message, ">>> differences in setting '%s.%s':", name, pname); + g_hash_table_iter_init (&iter2, setting); + while (g_hash_table_iter_next (&iter2, (gpointer *) &pname, NULL)) + __NMTST_LOG (g_message, ">>> differences in setting '%s.%s'", name, pname); + } } } g_assert (compare); |