about summary refs log tree commit diff
path: root/shared/nm-utils/nm-test-utils.h
diff options
context:
space:
mode:
authorMichael Biebl <biebl@debian.org>2018-09-23 10:11:11 +0200
committerMichael Biebl <biebl@debian.org>2018-09-23 10:11:11 +0200
commit135c3be0fb0eedb7a1b493ffde6c1ab3d23771f6 (patch)
tree40408d2ad887437e3ca63ff7fc6334bf22ae3fe6 /shared/nm-utils/nm-test-utils.h
parent81e5928f26b40b0227604ccaf4b051fe14c9b3ef (diff)
parente126f3e804c35480c4f075777430419d6ece23da (diff)
Update upstream source from tag 'upstream/1.12.4'
Update to upstream version '1.12.4'
with Debian dir 650b52e60bf462f2972d0c33deec2cb171953445
Diffstat (limited to 'shared/nm-utils/nm-test-utils.h')
-rw-r--r--shared/nm-utils/nm-test-utils.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/shared/nm-utils/nm-test-utils.h b/shared/nm-utils/nm-test-utils.h
index 743893f0..d29e9ae7 100644
--- a/shared/nm-utils/nm-test-utils.h
+++ b/shared/nm-utils/nm-test-utils.h
@@ -573,8 +573,9 @@ __nmtst_init (int *argc, char ***argv, gboolean assert_logging, const char *log_
 #endif
 	} else {
 		/* We were called not to set logging levels. This means, that the user
-		 * expects to assert against (all) messages. Any uncought message is fatal. */
-		g_log_set_always_fatal (G_LOG_LEVEL_MASK);
+		 * expects to assert against (all) messages.
+		 * Any uncaught message on >debug level is fatal. */
+		g_log_set_always_fatal (G_LOG_LEVEL_MASK & ~G_LOG_LEVEL_DEBUG);
 	}
 
 	if ((!__nmtst_internal.assert_logging || (__nmtst_internal.assert_logging && __nmtst_internal.no_expect_message)) &&