colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tests: handle no_expect_message also for tests without assert-logging

Browse Source
This commit is contained in:
Thomas Haller
2015-10-26 13:36:05 +01:00
parent d5ef08e01e
commit 88a2f1c93b
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/nm-test-utils.h
View File

@@ -400,6 +400,8 @@ __nmtst_init (int *argc, char ***argv, gboolean assert_logging, const char *log_
*out_set_logging = TRUE; *out_set_logging = TRUE;
#endif #endif
g_assert (success); 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) { } else if (__nmtst_internal.no_expect_message) {
/* We have a test that would be assert_logging, but the user specified 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 * This transforms g_test_expect_message() into a NOP, but we also have to relax