diff options
| author | Thomas Haller <thaller@redhat.com> | 2018-01-02 12:13:00 +0100 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2018-01-08 12:38:53 +0100 |
| commit | 66b80bd652332755ac05680fdff173f41394d411 (patch) | |
| tree | 1edfda653838932f61a6c1e3e9aa6a7ae1719598 | |
| parent | 22ef6a507a308f2fe495b60bef78ac2ca00fb6d2 (diff) | |
| download | NetworkManager-66b80bd652332755ac05680fdff173f41394d411.tar.gz | |
tests: add NMTST_EXPECT*() macros
Will be used next...
| -rw-r--r-- | shared/nm-utils/nm-test-utils.h | 14 | ||||
| -rw-r--r-- | src/nm-test-utils-core.h | 8 |
2 files changed, 22 insertions, 0 deletions
diff --git a/shared/nm-utils/nm-test-utils.h b/shared/nm-utils/nm-test-utils.h index 6fa4e85f0a..f4f05de760 100644 --- a/shared/nm-utils/nm-test-utils.h +++ b/shared/nm-utils/nm-test-utils.h @@ -670,6 +670,20 @@ nmtst_test_quick (void) } G_STMT_END #endif +#define NMTST_EXPECT(domain, level, msg) g_test_expect_message (domain, level, msg) + +#if (NETWORKMANAGER_COMPILATION) & NM_NETWORKMANAGER_COMPILATION_WITH_LIBNM_UTIL +#define NMTST_EXPECT_LIBNM_U(level, msg) NMTST_EXPECT ("libnm-util", level, msg) +#define NMTST_EXPECT_LIBNM_G(level, msg) NMTST_EXPECT ("libnm-glib", level, msg) + +#define NMTST_EXPECT_LIBNM_U_CRITICAL(msg) NMTST_EXPECT_LIBNM_U (G_LOG_LEVEL_CRITICAL, msg) +#define NMTST_EXPECT_LIBNM_G_CRITICAL(msg) NMTST_EXPECT_LIBNM_G (G_LOG_LEVEL_CRITICAL, msg) +#else +#define NMTST_EXPECT_LIBNM(level, msg) NMTST_EXPECT ("libnm", level, msg) + +#define NMTST_EXPECT_LIBNM_CRITICAL(msg) NMTST_EXPECT_LIBNM (G_LOG_LEVEL_CRITICAL, msg) +#endif + /*****************************************************************************/ typedef struct _NmtstTestData NmtstTestData; diff --git a/src/nm-test-utils-core.h b/src/nm-test-utils-core.h index a3d9f2a36d..da24992edc 100644 --- a/src/nm-test-utils-core.h +++ b/src/nm-test-utils-core.h @@ -30,6 +30,14 @@ /*****************************************************************************/ +#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) { |