summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2015-10-26 13:36:05 +0100
committerThomas Haller <thaller@redhat.com>2015-11-01 17:28:07 +0100
commit88a2f1c93bb2c19fc664d568f13c426a5ce7295b (patch)
treee418e2e9fcd70da77528cc667194861f0f962d48 /include
parentd5ef08e01e0d613f3cc9f4d66d066e579f2ac6f5 (diff)
tests: handle no_expect_message also for tests without assert-logging
Diffstat (limited to 'include')
-rw-r--r--include/nm-test-utils.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/nm-test-utils.h b/include/nm-test-utils.h
index 54a326904c..6d4f790cc9 100644
--- a/include/nm-test-utils.h
+++ b/include/nm-test-utils.h
@@ -400,6 +400,8 @@ __nmtst_init (int *argc, char ***argv, gboolean assert_logging, const char *log_
*out_set_logging = TRUE;
#endif
g_assert (success);
+ if (__nmtst_internal.no_expect_message)
+ g_log_set_always_fatal (G_LOG_FATAL_MASK);
} else if (__nmtst_internal.no_expect_message) {
/* We have a test that would be assert_logging, but the user specified no_expect_message.
* This transforms g_test_expect_message() into a NOP, but we also have to relax