fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-05 21:38:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

test: fix setup of logging for no-expect-message

Browse source 
Tests with assert-logging would never overwrite the logging level,
even if no-expect-message was set. Allow resetting the logging level
if no-expect-message is mixed with explicitly setting up logging.

    NMTST_DEBUG='log-level=DEBUG,log-domains=ALL,no-expect-message' make check -C src/tests/config/

(cherry picked from commit 5e74891b58)
This commit is contained in:
Thomas Haller 2015-02-16 16:02:59 +01:00
parent c3bd16c2b6
commit 8c6348c6e2
1 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
include/nm-test-utils.h
View file

@ -275,6 +275,18 @@ __nmtst_init (int *argc, char ***argv, gboolean assert_logging, const char *log_
* This transforms g_test_expect_message() into a NOP, but we also have to relax
* g_log_set_always_fatal(), which was set by g_test_init(). */
g_log_set_always_fatal (G_LOG_FATAL_MASK);
#ifdef __NETWORKMANAGER_LOGGING_H__
if (c_log_domains || c_log_level) {
/* Normally, tests with assert_logging do not overwrite the logging level/domains because
* the logging statements are part of the assertions. But if the test is run with
* no-expect-message *and* the logging is set explicitly via environment variables,
* we still reset the logging. */
gboolean success;
success = nm_logging_setup (log_level, log_domains, NULL, NULL);
g_assert (success);
}
#endif
} else {
#if GLIB_CHECK_VERSION(2,34,0)
/* We were called not to set logging levels. This means, that the user