fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2025-12-30 07:20:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

tests: move nmtst_init_with_logging() to "libnm-glib-aux/nm-test-utils.h"

Browse source
This commit is contained in:
Thomas Haller 2021-03-09 10:53:47 +01:00
parent e08a0a3a68
commit 5235ea3bf4
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728
2 changed files with 34 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
src/core/nm-test-utils-core.h
View file

@ -15,36 +15,6 @@
/*****************************************************************************/
#define NMTST_EXPECT_NM(level, msg) NMTST_EXPECT("NetworkManager", level, msg)
#define NMTST_EXPECT_NM_ERROR(msg) NMTST_EXPECT_NM(G_LOG_LEVEL_MESSAGE, "*<error> [*] " msg)
#define NMTST_EXPECT_NM_WARN(msg) NMTST_EXPECT_NM(G_LOG_LEVEL_MESSAGE, "*<warn> [*] " msg)
#define NMTST_EXPECT_NM_INFO(msg) NMTST_EXPECT_NM(G_LOG_LEVEL_INFO, "*<info> [*] " msg)
#define NMTST_EXPECT_NM_DEBUG(msg) NMTST_EXPECT_NM(G_LOG_LEVEL_DEBUG, "*<debug> [*] " msg)
#define NMTST_EXPECT_NM_TRACE(msg) NMTST_EXPECT_NM(G_LOG_LEVEL_DEBUG, "*<trace> [*] " msg)
static inline void
nmtst_init_with_logging(int *argc, char ***argv, const char *log_level, const char *log_domains)
{
__nmtst_init(argc, argv, FALSE, log_level, log_domains, NULL);
}
static inline void
nmtst_init_assert_logging(int *argc, char ***argv, const char *log_level, const char *log_domains)
{
gboolean set_logging;
__nmtst_init(argc, argv, TRUE, NULL, NULL, &set_logging);
if (!set_logging) {
gboolean success;
success = nm_logging_setup(log_level, log_domains, NULL, NULL);
g_assert(success);
}
}
/*****************************************************************************/
#ifdef __NETWORKMANAGER_PLATFORM_H__
static inline NMPlatformIP4Address *

34
src/libnm-glib-aux/nm-test-utils.h
View file

@ -1815,6 +1815,40 @@ _nmtst_assert_resolve_relative_path_equals(const char *f1,
/*****************************************************************************/
#ifdef __NETWORKMANAGER_LOGGING_H__
#define NMTST_EXPECT_NM(level, msg) NMTST_EXPECT("NetworkManager", level, msg)
#define NMTST_EXPECT_NM_ERROR(msg) NMTST_EXPECT_NM(G_LOG_LEVEL_MESSAGE, "*<error> [*] " msg)
#define NMTST_EXPECT_NM_WARN(msg) NMTST_EXPECT_NM(G_LOG_LEVEL_MESSAGE, "*<warn> [*] " msg)
#define NMTST_EXPECT_NM_INFO(msg) NMTST_EXPECT_NM(G_LOG_LEVEL_INFO, "*<info> [*] " msg)
#define NMTST_EXPECT_NM_DEBUG(msg) NMTST_EXPECT_NM(G_LOG_LEVEL_DEBUG, "*<debug> [*] " msg)
#define NMTST_EXPECT_NM_TRACE(msg) NMTST_EXPECT_NM(G_LOG_LEVEL_DEBUG, "*<trace> [*] " msg)
static inline void
nmtst_init_with_logging(int *argc, char ***argv, const char *log_level, const char *log_domains)
{
__nmtst_init(argc, argv, FALSE, log_level, log_domains, NULL);
}
static inline void
nmtst_init_assert_logging(int *argc, char ***argv, const char *log_level, const char *log_domains)
{
gboolean set_logging;
__nmtst_init(argc, argv, TRUE, NULL, NULL, &set_logging);
if (!set_logging) {
gboolean success;
success = nm_logging_setup(log_level, log_domains, NULL, NULL);
g_assert(success);
}
}
#endif
/*****************************************************************************/
#ifdef __NETWORKMANAGER_LOGGING_H__
static inline gpointer
nmtst_logging_disable(gboolean always)