2020-09-29 16:42:22 +02:00
|
|
|
|
/* SPDX-License-Identifier: LGPL-2.1+ */
|
2014-03-14 17:49:49 +01:00
|
|
|
|
/*
|
2019-10-01 09:20:35 +02:00
|
|
|
|
* Copyright (C) 2014 Red Hat, Inc.
|
2014-03-14 17:49:49 +01:00
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
|
|
#ifndef __NM_TEST_UTILS_H__
|
|
|
|
|
|
#define __NM_TEST_UTILS_H__
|
|
|
|
|
|
|
2018-01-02 13:37:06 +01:00
|
|
|
|
#if defined(NETWORKMANAGER_COMPILATION) && !defined(NETWORKMANAGER_COMPILATION_TEST)
|
|
|
|
|
|
#error Need to mark the compilation with NETWORKMANAGER_COMPILATION_TEST.
|
|
|
|
|
|
#endif
|
|
|
|
|
|
|
2015-04-09 15:03:58 +02:00
|
|
|
|
/*******************************************************************************
|
|
|
|
|
|
* HOWTO run tests.
|
|
|
|
|
|
*
|
|
|
|
|
|
* Our tests (make check) include this header-only file nm-test-utils.h.
|
|
|
|
|
|
*
|
2018-10-18 12:14:44 +02:00
|
|
|
|
* You should always include this header *as last*. Reason is, that depending on
|
|
|
|
|
|
* previous includes, functionality will be enabled.
|
|
|
|
|
|
*
|
2015-04-09 15:03:58 +02:00
|
|
|
|
* Logging:
|
|
|
|
|
|
* In tests, nm-logging redirects to glib logging. By default, glib suppresses all debug
|
|
|
|
|
|
* messages unless you set G_MESSAGES_DEBUG. To enable debug logging, you can explicitly set
|
|
|
|
|
|
* G_MESSAGES_DEBUG. Otherwise, nm-test will set G_MESSAGES_DEBUG=all in debug mode (see below).
|
|
|
|
|
|
* For nm-logging, you can configure the log-level and domains via NMTST_DEBUG environment
|
|
|
|
|
|
* variable.
|
|
|
|
|
|
*
|
|
|
|
|
|
* Assert-logging:
|
|
|
|
|
|
* Some tests assert against logged messages (g_test_expect_message()).
|
|
|
|
|
|
* By specifying no-expect-message in NMTST_DEBUG, you can disable assert logging
|
|
|
|
|
|
* and g_test_assert_expected_messages() will not fail.
|
|
|
|
|
|
*
|
|
|
|
|
|
* NMTST_SEED_RAND environment variable:
|
2018-07-24 15:54:29 +02:00
|
|
|
|
* Tests that use random numbers from nmtst_get_rand() get seeded at each start.
|
|
|
|
|
|
* You can specify the seed by setting NMTST_SEED_RAND to a particular number or empty ("")
|
|
|
|
|
|
* for a random one. If NMTST_SEED_RAND is not set (default) a stable seed gets chosen.
|
|
|
|
|
|
* Tests will print the seed to stdout, so that you know which one was chosen or generated.
|
2015-04-09 15:03:58 +02:00
|
|
|
|
*
|
|
|
|
|
|
*
|
|
|
|
|
|
* NMTST_DEBUG environment variable:
|
|
|
|
|
|
*
|
|
|
|
|
|
* "debug", "no-debug": when at test is run in debug mode, it might behave differently,
|
|
|
|
|
|
* depending on the test. See nmtst_is_debug().
|
|
|
|
|
|
* Known differences:
|
|
|
|
|
|
* - a test might leave the logging level unspecified. In this case, running in
|
|
|
|
|
|
* debug mode, will turn on DEBUG logging, otherwise WARN logging only.
|
|
|
|
|
|
* - if G_MESSAGES_DEBUG is unset, nm-test will set G_MESSAGES_DEBUG=all
|
|
|
|
|
|
* for tests that don't do assert-logging.
|
|
|
|
|
|
* Debug mode is determined as follows (highest priority first):
|
|
|
|
|
|
* - command line option --debug/--no-debug
|
|
|
|
|
|
* - NMTST_DEBUG=debug/no-debug
|
|
|
|
|
|
* - setting NMTST_DEBUG implies debugging turned on
|
|
|
|
|
|
* - g_test_verbose()
|
|
|
|
|
|
*
|
|
|
|
|
|
* "no-expect-message": for tests that would assert against log messages, disable
|
|
|
|
|
|
* those asserts.
|
|
|
|
|
|
*
|
|
|
|
|
|
* "log-level=LEVEL", "log-domains=DOMAIN": reset the log level and domain for tests.
|
|
|
|
|
|
* It only has an effect for nm-logging messages.
|
|
|
|
|
|
* This has no effect if the test asserts against logging (unless no-expect-message),
|
|
|
|
|
|
* otherwise, changing the logging would break tests.
|
|
|
|
|
|
* If you set the level to DEBUG or TRACE, it also sets G_MESSAGES_DEBUG=all (unless
|
|
|
|
|
|
* in assert-logging mode and unless G_MESSAGES_DEBUG is already defined).
|
|
|
|
|
|
*
|
2015-11-27 10:34:38 +01:00
|
|
|
|
* "TRACE", this is shorthand for "log-level=TRACE".
|
|
|
|
|
|
*
|
2016-03-14 14:23:30 +01:00
|
|
|
|
* "D", this is shorthand for "log-level=TRACE,no-expect-message".
|
|
|
|
|
|
*
|
2015-04-09 15:03:58 +02:00
|
|
|
|
* "sudo-cmd=PATH": when running root tests as normal user, the test will execute
|
|
|
|
|
|
* itself by invoking sudo at PATH.
|
|
|
|
|
|
* For example
|
|
|
|
|
|
* NMTST_DEBUG="sudo-cmd=$PWD/tools/test-sudo-wrapper.sh" make -C src/platform/tests/ check
|
|
|
|
|
|
*
|
2015-04-30 12:12:22 +02:00
|
|
|
|
* "slow|quick|thorough": enable/disable long-running tests. This sets nmtst_test_quick().
|
|
|
|
|
|
* Whether long-running tests are enabled is determined as follows (highest priority first):
|
|
|
|
|
|
* - specifying the value in NMTST_DEBUG has highest priority
|
|
|
|
|
|
* - respect g_test_quick(), if the command line contains '-mslow', '-mquick', '-mthorough'.
|
2017-05-31 10:45:47 +02:00
|
|
|
|
* - use compile time default (CFLAGS=-DNMTST_TEST_QUICK=TRUE)
|
|
|
|
|
|
* - enable slow tests by default
|
2015-04-30 12:12:22 +02:00
|
|
|
|
*
|
nmtst: support -p and -s arguments from gtestutils via $NMTST_DEBUG
For tests based on glib's test framework, you can select which tests to
run by passing -p/-s on the command line.
Usually, we want to invoke our tests via `make check` which conveniently
calls valgrind (run-test-valgrind.sh) or spawns a private D-Bus server
(libnm-test-launch.sh, libnm-glib-test-launch.sh). At that point, it is
not directly possible to specify command line arguments for the tests,
which is why it is convenient to specify arguments via $NMTST_DEBUG
environment variable.
Parse "p" and "s" arguments from $NMTST_DEBUG and pass them to g_test_init()
to select which tests to run.
NMTST_DEBUG=p=/core/general/test_setting_ip4_changed_signal ./libnm-core/tests/test-general
However, there is a problem here: in gtestutils, -p/-s conflicts with --tap,
which is how our Makefile invokes the tests. Thus the new options explicitly
don't work when being called during `make check`. Which makes this much
less useful. I only noticed that afterwards, so still keep the patch
because it might still be convenient during developing tests to set the
environment variable once, and then repeatedly spawn the tests, without
specifying -p/-s.
2015-11-23 18:15:39 +01:00
|
|
|
|
* "p=PATH"|"s=PATH": passes the path to g_test_init() as "-p" and "-s", respectively.
|
|
|
|
|
|
* Unfortunately, these options conflict with "--tap" which our makefile passes to the
|
|
|
|
|
|
* tests, thus it's only useful outside of `make check`.
|
|
|
|
|
|
*
|
2015-04-09 15:03:58 +02:00
|
|
|
|
*******************************************************************************/
|
2014-03-14 17:49:49 +01:00
|
|
|
|
|
2016-02-12 14:44:52 +01:00
|
|
|
|
#include "nm-default.h"
|
|
|
|
|
|
|
2016-06-16 11:04:51 +02:00
|
|
|
|
#if defined(NM_ASSERT_NO_MSG) && NM_ASSERT_NO_MSG
|
2016-06-06 15:20:05 +02:00
|
|
|
|
#undef g_return_if_fail_warning
|
|
|
|
|
|
#undef g_assertion_message_expr
|
|
|
|
|
|
#endif
|
|
|
|
|
|
|
2014-03-14 17:49:49 +01:00
|
|
|
|
#include <arpa/inet.h>
|
2014-04-22 16:55:28 +02:00
|
|
|
|
#include <stdio.h>
|
|
|
|
|
|
#include <unistd.h>
|
2014-04-23 17:12:45 +02:00
|
|
|
|
#include <stdlib.h>
|
2014-04-17 10:49:01 +02:00
|
|
|
|
#include <string.h>
|
2014-04-23 16:54:54 +02:00
|
|
|
|
#include <errno.h>
|
2014-03-14 17:49:49 +01:00
|
|
|
|
|
2018-10-12 18:05:48 +02:00
|
|
|
|
#ifndef NM_TEST_UTILS_NO_LIBNM
|
2014-04-24 20:18:46 +02:00
|
|
|
|
#include "nm-utils.h"
|
2018-10-12 18:05:48 +02:00
|
|
|
|
#endif
|
2014-04-24 20:18:46 +02:00
|
|
|
|
|
2016-10-02 18:22:50 +02:00
|
|
|
|
/*****************************************************************************/
|
2014-07-18 23:35:22 +02:00
|
|
|
|
|
2016-06-06 15:20:05 +02:00
|
|
|
|
#define NMTST_G_RETURN_MSG_S(expr) "*: assertion '" NM_ASSERT_G_RETURN_EXPR(expr) "' failed"
|
2016-06-06 18:09:40 +02:00
|
|
|
|
#define NMTST_G_RETURN_MSG(expr) NMTST_G_RETURN_MSG_S(#expr)
|
|
|
|
|
|
|
2016-10-02 18:22:50 +02:00
|
|
|
|
/*****************************************************************************/
|
2016-06-06 18:09:40 +02:00
|
|
|
|
|
2014-07-18 23:35:22 +02:00
|
|
|
|
/* general purpose functions that have no dependency on other nmtst functions */
|
|
|
|
|
|
|
2016-03-04 16:46:16 +01:00
|
|
|
|
#define nmtst_assert_error(error, expect_error_domain, expect_error_code, expect_error_pattern) \
|
|
|
|
|
|
G_STMT_START \
|
|
|
|
|
|
{ \
|
|
|
|
|
|
GError * _error = (error); \
|
|
|
|
|
|
GQuark _expect_error_domain = (expect_error_domain); \
|
|
|
|
|
|
const char *_expect_error_pattern = (expect_error_pattern); \
|
|
|
|
|
|
\
|
|
|
|
|
|
if (_expect_error_domain) \
|
|
|
|
|
|
g_assert_error(_error, _expect_error_domain, (expect_error_code)); \
|
|
|
|
|
|
else \
|
|
|
|
|
|
g_assert(_error); \
|
|
|
|
|
|
g_assert(_error->message); \
|
|
|
|
|
|
if (_expect_error_pattern \
|
|
|
|
|
|
&& !g_pattern_match_simple(_expect_error_pattern, _error->message)) { \
|
|
|
|
|
|
g_error("%s:%d: error message does not have expected pattern '%s'. Instead it is " \
|
|
|
|
|
|
"'%s' (%s, %d)", \
|
|
|
|
|
|
__FILE__, \
|
|
|
|
|
|
__LINE__, \
|
|
|
|
|
|
_expect_error_pattern, \
|
|
|
|
|
|
_error->message, \
|
|
|
|
|
|
g_quark_to_string(_error->domain), \
|
|
|
|
|
|
_error->code); \
|
|
|
|
|
|
} \
|
|
|
|
|
|
} \
|
|
|
|
|
|
G_STMT_END
|
2020-09-28 16:03:33 +02:00
|
|
|
|
|
2015-11-26 23:26:00 +01:00
|
|
|
|
#define NMTST_WAIT(max_wait_ms, wait) \
|
|
|
|
|
|
({ \
|
|
|
|
|
|
gboolean _not_expired = TRUE; \
|
2017-05-31 10:03:50 +02:00
|
|
|
|
const gint64 nmtst_wait_start_us = g_get_monotonic_time(); \
|
|
|
|
|
|
const gint64 nmtst_wait_duration_us = (max_wait_ms) *1000L; \
|
|
|
|
|
|
const gint64 nmtst_wait_end_us = nmtst_wait_start_us + nmtst_wait_duration_us; \
|
2018-06-20 14:41:03 +02:00
|
|
|
|
gint64 _nmtst_wait_remaining_us = nmtst_wait_duration_us; \
|
|
|
|
|
|
int _nmtst_wait_iteration = 0; \
|
2015-06-22 12:40:06 +02:00
|
|
|
|
\
|
2015-11-26 23:26:00 +01:00
|
|
|
|
while (TRUE) { \
|
2018-06-20 14:41:03 +02:00
|
|
|
|
_nm_unused const gint64 nmtst_wait_remaining_us = _nmtst_wait_remaining_us; \
|
|
|
|
|
|
_nm_unused int nmtst_wait_iteration = _nmtst_wait_iteration++; \
|
|
|
|
|
|
\
|
2015-06-22 12:40:06 +02:00
|
|
|
|
{wait}; \
|
2018-06-20 14:41:03 +02:00
|
|
|
|
_nmtst_wait_remaining_us = (nmtst_wait_end_us - g_get_monotonic_time()); \
|
|
|
|
|
|
if (_nmtst_wait_remaining_us <= 0) { \
|
2015-11-26 23:26:00 +01:00
|
|
|
|
_not_expired = FALSE; \
|
|
|
|
|
|
break; \
|
2015-06-22 12:40:06 +02:00
|
|
|
|
} \
|
2020-09-28 16:03:33 +02:00
|
|
|
|
} \
|
2015-11-26 23:26:00 +01:00
|
|
|
|
_not_expired; \
|
|
|
|
|
|
})
|
2020-09-28 16:03:33 +02:00
|
|
|
|
|
2015-11-26 23:26:00 +01:00
|
|
|
|
#define NMTST_WAIT_ASSERT(max_wait_ms, wait) \
|
|
|
|
|
|
G_STMT_START \
|
|
|
|
|
|
{ \
|
|
|
|
|
|
if (!(NMTST_WAIT(max_wait_ms, wait))) \
|
|
|
|
|
|
g_assert_not_reached(); \
|
2015-06-22 12:40:06 +02:00
|
|
|
|
} \
|
|
|
|
|
|
G_STMT_END
|
2020-09-28 16:03:33 +02:00
|
|
|
|
|
2018-04-05 19:02:18 +02:00
|
|
|
|
#define nmtst_assert_nonnull(command) \
|
|
|
|
|
|
({ \
|
|
|
|
|
|
typeof(*(command)) *_ptr = (command); \
|
|
|
|
|
|
\
|
|
|
|
|
|
g_assert(_ptr && (TRUE || (command))); \
|
|
|
|
|
|
_ptr; \
|
|
|
|
|
|
})
|
|
|
|
|
|
|
2016-05-09 11:04:51 +02:00
|
|
|
|
#define nmtst_assert_success(success, error) \
|
|
|
|
|
|
G_STMT_START \
|
|
|
|
|
|
{ \
|
|
|
|
|
|
g_assert_no_error(error); \
|
|
|
|
|
|
g_assert((success)); \
|
|
|
|
|
|
} \
|
|
|
|
|
|
G_STMT_END
|
2015-06-13 21:53:49 +02:00
|
|
|
|
|
2016-02-14 21:28:22 +01:00
|
|
|
|
#define nmtst_assert_no_success(success, error) \
|
|
|
|
|
|
G_STMT_START \
|
|
|
|
|
|
{ \
|
|
|
|
|
|
g_assert(error); \
|
|
|
|
|
|
g_assert(!(success)); \
|
|
|
|
|
|
} \
|
|
|
|
|
|
G_STMT_END
|
|
|
|
|
|
|
2016-10-02 18:22:50 +02:00
|
|
|
|
/*****************************************************************************/
|
2014-07-18 23:35:22 +02:00
|
|
|
|
|
platform: merge NMPlatformError with nm-error
Platform had it's own scheme for reporting errors: NMPlatformError.
Before, NMPlatformError indicated success via zero, negative integer
values are numbers from <errno.h>, and positive integer values are
platform specific codes. This changes now according to nm-error:
success is still zero. Negative values indicate a failure, where the
numeric value is either from <errno.h> or one of our error codes.
The meaning of positive values depends on the functions. Most functions
can only report an error reason (negative) and success (zero). For such
functions, positive values should never be returned (but the caller
should anticipate them).
For some functions, positive values could mean additional information
(but still success). That depends.
This is also what systemd does, except that systemd only returns
(negative) integers from <errno.h>, while we merge our own error codes
into the range of <errno.h>.
The advantage is to get rid of one way how to signal errors. The other
advantage is, that these error codes are compatible with all other
nm-errno values. For example, previously negative values indicated error
codes from <errno.h>, but it did not entail error codes from netlink.
2018-12-22 14:13:05 +01:00
|
|
|
|
/* Our nm-error error numbers use negative values to signal failure.
|
|
|
|
|
|
* A non-negative value signals success. Hence, the correct way for checking
|
|
|
|
|
|
* is always (r < 0) vs. (r >= 0). Never (r == 0).
|
|
|
|
|
|
*
|
|
|
|
|
|
* For assertions in tests, we also want to assert that no positive values
|
|
|
|
|
|
* are returned. For a lot of functions, positive return values are unexpected
|
|
|
|
|
|
* and a bug. This macro evaluates @r to success or failure, while asserting
|
|
|
|
|
|
* that @r is not positive. */
|
|
|
|
|
|
#define NMTST_NM_ERR_SUCCESS(r) \
|
|
|
|
|
|
({ \
|
|
|
|
|
|
const int _r = (r); \
|
|
|
|
|
|
\
|
|
|
|
|
|
if (_r >= 0) \
|
|
|
|
|
|
g_assert_cmpint(_r, ==, 0); \
|
|
|
|
|
|
(_r >= 0); \
|
|
|
|
|
|
})
|
|
|
|
|
|
|
|
|
|
|
|
/*****************************************************************************/
|
|
|
|
|
|
|
2014-03-14 17:49:49 +01:00
|
|
|
|
struct __nmtst_internal {
|
|
|
|
|
|
GRand * rand0;
|
|
|
|
|
|
guint32 rand_seed;
|
|
|
|
|
|
GRand * rand;
|
2014-04-17 10:49:01 +02:00
|
|
|
|
gboolean is_debug;
|
2014-04-24 21:01:58 +02:00
|
|
|
|
gboolean assert_logging;
|
2014-04-25 15:34:49 +02:00
|
|
|
|
gboolean no_expect_message;
|
2015-04-30 12:12:22 +02:00
|
|
|
|
gboolean test_quick;
|
2015-11-23 18:50:48 +01:00
|
|
|
|
gboolean test_tap_log;
|
2014-04-23 16:54:54 +02:00
|
|
|
|
char * sudo_cmd;
|
|
|
|
|
|
char ** orig_argv;
|
2014-03-14 17:49:49 +01:00
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
extern struct __nmtst_internal __nmtst_internal;
|
|
|
|
|
|
|
|
|
|
|
|
#define NMTST_DEFINE() \
|
2015-01-07 20:32:11 +01:00
|
|
|
|
struct __nmtst_internal __nmtst_internal = {0}; \
|
|
|
|
|
|
\
|
|
|
|
|
|
__attribute__((destructor)) static void _nmtst_exit(void) \
|
|
|
|
|
|
{ \
|
2015-04-09 15:35:00 +02:00
|
|
|
|
__nmtst_internal.assert_logging = FALSE; \
|
2015-01-07 20:32:11 +01:00
|
|
|
|
g_test_assert_expected_messages(); \
|
2015-04-09 15:35:00 +02:00
|
|
|
|
nmtst_free(); \
|
2015-01-07 20:32:11 +01:00
|
|
|
|
}
|
2014-03-14 17:49:49 +01:00
|
|
|
|
|
2017-02-23 15:24:18 +01:00
|
|
|
|
static inline gboolean
|
2014-04-17 10:47:48 +02:00
|
|
|
|
nmtst_initialized(void)
|
|
|
|
|
|
{
|
|
|
|
|
|
return !!__nmtst_internal.rand0;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2015-03-13 14:39:16 +01:00
|
|
|
|
#define __NMTST_LOG(cmd, ...) \
|
2014-04-24 21:01:58 +02:00
|
|
|
|
G_STMT_START \
|
|
|
|
|
|
{ \
|
|
|
|
|
|
g_assert(nmtst_initialized()); \
|
2014-04-25 15:34:49 +02:00
|
|
|
|
if (!__nmtst_internal.assert_logging || __nmtst_internal.no_expect_message) { \
|
2015-03-13 14:39:16 +01:00
|
|
|
|
cmd(__VA_ARGS__); \
|
2014-04-24 21:01:58 +02:00
|
|
|
|
} else { \
|
2015-03-13 14:39:16 +01:00
|
|
|
|
printf(_NM_UTILS_MACRO_FIRST(__VA_ARGS__) "\n" _NM_UTILS_MACRO_REST(__VA_ARGS__)); \
|
2020-09-28 16:03:33 +02:00
|
|
|
|
} \
|
2014-04-24 21:01:58 +02:00
|
|
|
|
} \
|
|
|
|
|
|
G_STMT_END
|
|
|
|
|
|
|
2014-04-17 10:49:01 +02:00
|
|
|
|
/* split the string inplace at specific delimiters, allowing escaping with '\\'.
|
|
|
|
|
|
* Returns a zero terminated array of pointers into @str.
|
|
|
|
|
|
*
|
|
|
|
|
|
* The caller must g_free() the returned argv array.
|
|
|
|
|
|
**/
|
2017-02-23 15:24:18 +01:00
|
|
|
|
static inline char **
|
2014-04-17 10:49:01 +02:00
|
|
|
|
nmtst_str_split(char *str, const char *delimiters)
|
|
|
|
|
|
{
|
|
|
|
|
|
const char *d;
|
|
|
|
|
|
GArray * result = g_array_sized_new(TRUE, FALSE, sizeof(char *), 3);
|
2020-09-28 16:03:33 +02:00
|
|
|
|
|
2014-04-17 10:49:01 +02:00
|
|
|
|
g_assert(str);
|
|
|
|
|
|
g_assert(delimiters && !strchr(delimiters, '\\'));
|
2020-09-28 16:03:33 +02:00
|
|
|
|
|
2014-04-17 10:49:01 +02:00
|
|
|
|
while (*str) {
|
|
|
|
|
|
gsize i = 0, j = 0;
|
2020-09-28 16:03:33 +02:00
|
|
|
|
|
2014-04-17 10:49:01 +02:00
|
|
|
|
while (TRUE) {
|
|
|
|
|
|
char c = str[i];
|
2020-09-28 16:03:33 +02:00
|
|
|
|
|
2014-04-17 10:49:01 +02:00
|
|
|
|
if (c == '\0') {
|
|
|
|
|
|
str[j++] = 0;
|
|
|
|
|
|
break;
|
|
|
|
|
|
} else if (c == '\\') {
|
|
|
|
|
|
str[j++] = str[++i];
|
|
|
|
|
|
if (!str[i])
|
|
|
|
|
|
break;
|
|
|
|
|
|
} else {
|
|
|
|
|
|
for (d = delimiters; *d; d++) {
|
|
|
|
|
|
if (c == *d) {
|
|
|
|
|
|
str[j++] = 0;
|
|
|
|
|
|
i++;
|
|
|
|
|
|
goto BREAK_INNER_LOOPS;
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
str[j++] = c;
|
|
|
|
|
|
}
|
|
|
|
|
|
i++;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
BREAK_INNER_LOOPS:
|
|
|
|
|
|
g_array_append_val(result, str);
|
|
|
|
|
|
str = &str[i];
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
return (char **) g_array_free(result, FALSE);
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2014-04-23 17:12:45 +02:00
|
|
|
|
/* free instances allocated by nmtst (especially nmtst_init()) on shutdown
|
|
|
|
|
|
* to release memory. After nmtst_free(), the test is uninitialized again. */
|
2017-02-23 15:24:18 +01:00
|
|
|
|
static inline void
|
2014-04-23 17:12:45 +02:00
|
|
|
|
nmtst_free(void)
|
|
|
|
|
|
{
|
|
|
|
|
|
if (!nmtst_initialized())
|
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
|
|
g_rand_free(__nmtst_internal.rand0);
|
|
|
|
|
|
if (__nmtst_internal.rand)
|
|
|
|
|
|
g_rand_free(__nmtst_internal.rand);
|
2014-04-23 16:54:54 +02:00
|
|
|
|
g_free(__nmtst_internal.sudo_cmd);
|
|
|
|
|
|
g_strfreev(__nmtst_internal.orig_argv);
|
2014-04-23 17:12:45 +02:00
|
|
|
|
|
|
|
|
|
|
memset(&__nmtst_internal, 0, sizeof(__nmtst_internal));
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2017-08-06 12:10:06 +02:00
|
|
|
|
static inline void
|
all: don't use gchar/gshort/gint/glong but C types
We commonly don't use the glib typedefs for char/short/int/long,
but their C types directly.
$ git grep '\<g\(char\|short\|int\|long\|float\|double\)\>' | wc -l
587
$ git grep '\<\(char\|short\|int\|long\|float\|double\)\>' | wc -l
21114
One could argue that using the glib typedefs is preferable in
public API (of our glib based libnm library) or where it clearly
is related to glib, like during
g_object_set (obj, PROPERTY, (gint) value, NULL);
However, that argument does not seem strong, because in practice we don't
follow that argument today, and seldomly use the glib typedefs.
Also, the style guide for this would be hard to formalize, because
"using them where clearly related to a glib" is a very loose suggestion.
Also note that glib typedefs will always just be typedefs of the
underlying C types. There is no danger of glib changing the meaning
of these typedefs (because that would be a major API break of glib).
A simple style guide is instead: don't use these typedefs.
No manual actions, I only ran the bash script:
FILES=($(git ls-files '*.[hc]'))
sed -i \
-e 's/\<g\(char\|short\|int\|long\|float\|double\)\>\( [^ ]\)/\1\2/g' \
-e 's/\<g\(char\|short\|int\|long\|float\|double\)\> /\1 /g' \
-e 's/\<g\(char\|short\|int\|long\|float\|double\)\>/\1/g' \
"${FILES[@]}"
2018-07-11 07:40:19 +02:00
|
|
|
|
_nmtst_log_handler(const char * log_domain,
|
2017-08-06 12:10:06 +02:00
|
|
|
|
GLogLevelFlags log_level,
|
all: don't use gchar/gshort/gint/glong but C types
We commonly don't use the glib typedefs for char/short/int/long,
but their C types directly.
$ git grep '\<g\(char\|short\|int\|long\|float\|double\)\>' | wc -l
587
$ git grep '\<\(char\|short\|int\|long\|float\|double\)\>' | wc -l
21114
One could argue that using the glib typedefs is preferable in
public API (of our glib based libnm library) or where it clearly
is related to glib, like during
g_object_set (obj, PROPERTY, (gint) value, NULL);
However, that argument does not seem strong, because in practice we don't
follow that argument today, and seldomly use the glib typedefs.
Also, the style guide for this would be hard to formalize, because
"using them where clearly related to a glib" is a very loose suggestion.
Also note that glib typedefs will always just be typedefs of the
underlying C types. There is no danger of glib changing the meaning
of these typedefs (because that would be a major API break of glib).
A simple style guide is instead: don't use these typedefs.
No manual actions, I only ran the bash script:
FILES=($(git ls-files '*.[hc]'))
sed -i \
-e 's/\<g\(char\|short\|int\|long\|float\|double\)\>\( [^ ]\)/\1\2/g' \
-e 's/\<g\(char\|short\|int\|long\|float\|double\)\> /\1 /g' \
-e 's/\<g\(char\|short\|int\|long\|float\|double\)\>/\1/g' \
"${FILES[@]}"
2018-07-11 07:40:19 +02:00
|
|
|
|
const char * message,
|
2017-08-06 12:10:06 +02:00
|
|
|
|
gpointer user_data)
|
|
|
|
|
|
{
|
|
|
|
|
|
g_print("%s\n", message);
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2017-02-23 15:24:18 +01:00
|
|
|
|
static inline void
|
test: setup logging during nmtst_init_assert_logging()
Before, when having a test with nmtst_init_assert_logging(),
the caller was expected to setup logging separately according
to the log level that the test asserts against.
Since 5e74891b58688a19c43fb8e50880166d94a4e901, the logging
level can be reset via NMTST_DEBUG also for tests that
assert logging. In this case, it would be useful, if the test
would not overwrite the logging level that is set externally
via NMTST_DEBUG.
Instead, let the test pass the logging configuration to
nmtst_init_assert_logging(), and nmtst will setup logging
-- either according to NMTST_DEBUG or as passed in.
This way, setting the log level works also for no-expect-message
tests:
NMTST_DEBUG="debug,no-expect-message,log-level=TRACE" $TEST
2015-03-26 13:03:58 +01:00
|
|
|
|
__nmtst_init(int * argc,
|
|
|
|
|
|
char *** argv,
|
|
|
|
|
|
gboolean assert_logging,
|
|
|
|
|
|
const char *log_level,
|
|
|
|
|
|
const char *log_domains,
|
|
|
|
|
|
gboolean * out_set_logging)
|
2014-03-14 17:49:49 +01:00
|
|
|
|
{
|
2014-04-17 10:49:01 +02:00
|
|
|
|
const char * nmtst_debug;
|
|
|
|
|
|
gboolean is_debug = FALSE;
|
|
|
|
|
|
char * c_log_level = NULL, *c_log_domains = NULL;
|
2014-04-23 16:54:54 +02:00
|
|
|
|
char * sudo_cmd = NULL;
|
2014-04-17 10:49:01 +02:00
|
|
|
|
GArray * debug_messages = g_array_new(TRUE, FALSE, sizeof(char *));
|
|
|
|
|
|
int i;
|
2014-04-25 15:34:49 +02:00
|
|
|
|
gboolean no_expect_message = FALSE;
|
test: setup logging during nmtst_init_assert_logging()
Before, when having a test with nmtst_init_assert_logging(),
the caller was expected to setup logging separately according
to the log level that the test asserts against.
Since 5e74891b58688a19c43fb8e50880166d94a4e901, the logging
level can be reset via NMTST_DEBUG also for tests that
assert logging. In this case, it would be useful, if the test
would not overwrite the logging level that is set externally
via NMTST_DEBUG.
Instead, let the test pass the logging configuration to
nmtst_init_assert_logging(), and nmtst will setup logging
-- either according to NMTST_DEBUG or as passed in.
This way, setting the log level works also for no-expect-message
tests:
NMTST_DEBUG="debug,no-expect-message,log-level=TRACE" $TEST
2015-03-26 13:03:58 +01:00
|
|
|
|
gboolean _out_set_logging;
|
2015-04-30 12:12:22 +02:00
|
|
|
|
gboolean test_quick = FALSE;
|
|
|
|
|
|
gboolean test_quick_set = FALSE;
|
|
|
|
|
|
gboolean test_quick_argv = FALSE;
|
nmtst: support -p and -s arguments from gtestutils via $NMTST_DEBUG
For tests based on glib's test framework, you can select which tests to
run by passing -p/-s on the command line.
Usually, we want to invoke our tests via `make check` which conveniently
calls valgrind (run-test-valgrind.sh) or spawns a private D-Bus server
(libnm-test-launch.sh, libnm-glib-test-launch.sh). At that point, it is
not directly possible to specify command line arguments for the tests,
which is why it is convenient to specify arguments via $NMTST_DEBUG
environment variable.
Parse "p" and "s" arguments from $NMTST_DEBUG and pass them to g_test_init()
to select which tests to run.
NMTST_DEBUG=p=/core/general/test_setting_ip4_changed_signal ./libnm-core/tests/test-general
However, there is a problem here: in gtestutils, -p/-s conflicts with --tap,
which is how our Makefile invokes the tests. Thus the new options explicitly
don't work when being called during `make check`. Which makes this much
less useful. I only noticed that afterwards, so still keep the patch
because it might still be convenient during developing tests to set the
environment variable once, and then repeatedly spawn the tests, without
specifying -p/-s.
2015-11-23 18:15:39 +01:00
|
|
|
|
gs_unref_ptrarray GPtrArray *p_tests = NULL;
|
|
|
|
|
|
gs_unref_ptrarray GPtrArray *s_tests = NULL;
|
2020-09-28 16:03:33 +02:00
|
|
|
|
|
test: setup logging during nmtst_init_assert_logging()
Before, when having a test with nmtst_init_assert_logging(),
the caller was expected to setup logging separately according
to the log level that the test asserts against.
Since 5e74891b58688a19c43fb8e50880166d94a4e901, the logging
level can be reset via NMTST_DEBUG also for tests that
assert logging. In this case, it would be useful, if the test
would not overwrite the logging level that is set externally
via NMTST_DEBUG.
Instead, let the test pass the logging configuration to
nmtst_init_assert_logging(), and nmtst will setup logging
-- either according to NMTST_DEBUG or as passed in.
This way, setting the log level works also for no-expect-message
tests:
NMTST_DEBUG="debug,no-expect-message,log-level=TRACE" $TEST
2015-03-26 13:03:58 +01:00
|
|
|
|
if (!out_set_logging)
|
|
|
|
|
|
out_set_logging = &_out_set_logging;
|
|
|
|
|
|
*out_set_logging = FALSE;
|
2020-09-28 16:03:33 +02:00
|
|
|
|
|
2014-04-17 10:47:48 +02:00
|
|
|
|
g_assert(!nmtst_initialized());
|
2020-09-28 16:03:33 +02:00
|
|
|
|
|
2014-03-14 17:49:49 +01:00
|
|
|
|
g_assert(!((!!argc) ^ (!!argv)));
|
2014-04-23 16:54:54 +02:00
|
|
|
|
g_assert(!argc || (g_strv_length(*argv) == *argc));
|
2014-04-24 21:01:58 +02:00
|
|
|
|
g_assert(!assert_logging || (!log_level && !log_domains));
|
2014-04-23 16:54:54 +02:00
|
|
|
|
|
2015-01-14 13:15:24 +01:00
|
|
|
|
#ifdef __NETWORKMANAGER_UTILS_H__
|
|
|
|
|
|
if (!nm_utils_get_testing_initialized())
|
|
|
|
|
|
_nm_utils_set_testing(_NM_UTILS_TEST_GENERAL);
|
|
|
|
|
|
#endif
|
|
|
|
|
|
|
2014-04-23 16:54:54 +02:00
|
|
|
|
if (argc)
|
|
|
|
|
|
__nmtst_internal.orig_argv = g_strdupv(*argv);
|
|
|
|
|
|
|
2014-04-24 21:01:58 +02:00
|
|
|
|
__nmtst_internal.assert_logging = !!assert_logging;
|
|
|
|
|
|
|
shared: restore compat code in nm-glib.h for 2.32 compatibility
In commit 8a46b25cfa8c33daa8af37bb8103ca02286001b1, NetworkManager
bumped its glib dependency to 2.40 or newer.
"nm-glib.h" header is precisely the compatiblity implementation that we
use to cope with older glib versions. Note, that the same implementation
is also used by applet and VPN plugins.
However, applet and VPN plugins don't yet require 2.40 glib. Also,
they don't yet require NetworkManager 1.12.0 API (which was the one
that bumped the glib requirement to 2.40). Hence, when "nm-glib.h"
is used in applet or VPN, it must still cope with older versions,
although, the code is not used by NetworkManager itself.
Partly revert 8a46b25cfa8c33daa8af37bb8103ca02286001b1 so that nm-glib.h
again works for 2.32 or newer.
The same is true, also for "nm-test-utils.h", which is also used by
applet and VPN plugins.
2018-07-09 13:20:17 +02:00
|
|
|
|
nm_g_type_init();
|
|
|
|
|
|
|
2014-04-17 10:49:01 +02:00
|
|
|
|
is_debug = g_test_verbose();
|
|
|
|
|
|
|
|
|
|
|
|
nmtst_debug = g_getenv("NMTST_DEBUG");
|
|
|
|
|
|
if (nmtst_debug) {
|
|
|
|
|
|
char **d_argv, **i_argv, *nmtst_debug_copy;
|
|
|
|
|
|
|
|
|
|
|
|
/* By setting then NMTST_DEBUG variable, @is_debug is set automatically.
|
|
|
|
|
|
* This can be reverted with no-debug (on command line or environment variable). */
|
|
|
|
|
|
is_debug = TRUE;
|
|
|
|
|
|
|
|
|
|
|
|
nmtst_debug_copy = g_strdup(nmtst_debug);
|
|
|
|
|
|
d_argv = nmtst_str_split(nmtst_debug_copy, ",; \t\r\n");
|
|
|
|
|
|
|
|
|
|
|
|
for (i_argv = d_argv; *i_argv; i_argv++) {
|
|
|
|
|
|
const char *debug = *i_argv;
|
|
|
|
|
|
|
|
|
|
|
|
if (!g_ascii_strcasecmp(debug, "debug"))
|
|
|
|
|
|
is_debug = TRUE;
|
|
|
|
|
|
else if (!g_ascii_strcasecmp(debug, "no-debug")) {
|
|
|
|
|
|
/* when specifying the NMTST_DEBUG variable, we set is_debug to true. Use this flag to disable this
|
|
|
|
|
|
* (e.g. for only setting the log-level, but not is_debug). */
|
|
|
|
|
|
is_debug = FALSE;
|
|
|
|
|
|
} else if (!g_ascii_strncasecmp(debug, "log-level=", strlen("log-level="))) {
|
|
|
|
|
|
g_free(c_log_level);
|
|
|
|
|
|
log_level = c_log_level = g_strdup(&debug[strlen("log-level=")]);
|
2016-03-14 14:23:30 +01:00
|
|
|
|
} else if (!g_ascii_strcasecmp(debug, "D")) {
|
|
|
|
|
|
/* shorthand for "log-level=TRACE,no-expect-message" */
|
|
|
|
|
|
g_free(c_log_level);
|
|
|
|
|
|
log_level = c_log_level = g_strdup("TRACE");
|
|
|
|
|
|
no_expect_message = TRUE;
|
2015-11-27 10:34:38 +01:00
|
|
|
|
} else if (!g_ascii_strcasecmp(debug, "TRACE")) {
|
|
|
|
|
|
g_free(c_log_level);
|
2016-03-14 14:23:30 +01:00
|
|
|
|
log_level = c_log_level = g_strdup("TRACE");
|
2014-04-17 10:49:01 +02:00
|
|
|
|
} else if (!g_ascii_strncasecmp(debug, "log-domains=", strlen("log-domains="))) {
|
|
|
|
|
|
g_free(c_log_domains);
|
|
|
|
|
|
log_domains = c_log_domains = g_strdup(&debug[strlen("log-domains=")]);
|
2014-04-23 16:54:54 +02:00
|
|
|
|
} else if (!g_ascii_strncasecmp(debug, "sudo-cmd=", strlen("sudo-cmd="))) {
|
|
|
|
|
|
g_free(sudo_cmd);
|
|
|
|
|
|
sudo_cmd = g_strdup(&debug[strlen("sudo-cmd=")]);
|
2014-04-25 15:34:49 +02:00
|
|
|
|
} else if (!g_ascii_strcasecmp(debug, "no-expect-message")) {
|
|
|
|
|
|
no_expect_message = TRUE;
|
nmtst: support -p and -s arguments from gtestutils via $NMTST_DEBUG
For tests based on glib's test framework, you can select which tests to
run by passing -p/-s on the command line.
Usually, we want to invoke our tests via `make check` which conveniently
calls valgrind (run-test-valgrind.sh) or spawns a private D-Bus server
(libnm-test-launch.sh, libnm-glib-test-launch.sh). At that point, it is
not directly possible to specify command line arguments for the tests,
which is why it is convenient to specify arguments via $NMTST_DEBUG
environment variable.
Parse "p" and "s" arguments from $NMTST_DEBUG and pass them to g_test_init()
to select which tests to run.
NMTST_DEBUG=p=/core/general/test_setting_ip4_changed_signal ./libnm-core/tests/test-general
However, there is a problem here: in gtestutils, -p/-s conflicts with --tap,
which is how our Makefile invokes the tests. Thus the new options explicitly
don't work when being called during `make check`. Which makes this much
less useful. I only noticed that afterwards, so still keep the patch
because it might still be convenient during developing tests to set the
environment variable once, and then repeatedly spawn the tests, without
specifying -p/-s.
2015-11-23 18:15:39 +01:00
|
|
|
|
} else if (!g_ascii_strncasecmp(debug, "p=", strlen("p="))) {
|
|
|
|
|
|
if (!p_tests)
|
|
|
|
|
|
p_tests = g_ptr_array_new_with_free_func(g_free);
|
|
|
|
|
|
g_ptr_array_add(p_tests, g_strdup(&debug[strlen("p=")]));
|
|
|
|
|
|
} else if (!g_ascii_strncasecmp(debug, "s=", strlen("s="))) {
|
|
|
|
|
|
if (!s_tests)
|
|
|
|
|
|
s_tests = g_ptr_array_new_with_free_func(g_free);
|
|
|
|
|
|
g_ptr_array_add(s_tests, g_strdup(&debug[strlen("s=")]));
|
2015-04-30 12:12:22 +02:00
|
|
|
|
} else if (!g_ascii_strcasecmp(debug, "slow")
|
|
|
|
|
|
|| !g_ascii_strcasecmp(debug, "thorough")) {
|
|
|
|
|
|
test_quick = FALSE;
|
|
|
|
|
|
test_quick_set = TRUE;
|
|
|
|
|
|
} else if (!g_ascii_strcasecmp(debug, "quick")) {
|
|
|
|
|
|
test_quick = TRUE;
|
|
|
|
|
|
test_quick_set = TRUE;
|
2014-04-17 10:49:01 +02:00
|
|
|
|
} else {
|
|
|
|
|
|
char *msg =
|
|
|
|
|
|
g_strdup_printf(">>> nmtst: ignore unrecognized NMTST_DEBUG option \"%s\"",
|
|
|
|
|
|
debug);
|
2020-09-28 16:03:33 +02:00
|
|
|
|
|
2014-04-17 10:49:01 +02:00
|
|
|
|
g_array_append_val(debug_messages, msg);
|
|
|
|
|
|
}
|
2020-09-28 16:03:33 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
2014-04-17 10:49:01 +02:00
|
|
|
|
g_free(d_argv);
|
|
|
|
|
|
g_free(nmtst_debug_copy);
|
|
|
|
|
|
}
|
2020-09-28 16:03:33 +02:00
|
|
|
|
|
2015-05-04 09:08:32 +02:00
|
|
|
|
if (__nmtst_internal.orig_argv) {
|
|
|
|
|
|
char **a = __nmtst_internal.orig_argv;
|
2020-09-28 16:03:33 +02:00
|
|
|
|
|
2015-04-30 12:12:22 +02:00
|
|
|
|
for (; *a; a++) {
|
2014-04-17 10:49:01 +02:00
|
|
|
|
if (!g_ascii_strcasecmp(*a, "--debug"))
|
|
|
|
|
|
is_debug = TRUE;
|
|
|
|
|
|
else if (!g_ascii_strcasecmp(*a, "--no-debug"))
|
|
|
|
|
|
is_debug = FALSE;
|
2015-05-04 09:08:32 +02:00
|
|
|
|
else if (!strcmp(*a, "-m=slow") || !strcmp(*a, "-m=thorough") || !strcmp(*a, "-m=quick")
|
|
|
|
|
|
|| (!strcmp(*a, "-m") && *(a + 1)
|
|
|
|
|
|
&& (!strcmp(*(a + 1), "quick") || !strcmp(*(a + 1), "slow")
|
|
|
|
|
|
|| !strcmp(*(a + 1), "thorough"))))
|
2015-04-30 12:12:22 +02:00
|
|
|
|
test_quick_argv = TRUE;
|
2015-11-23 18:50:48 +01:00
|
|
|
|
else if (strcmp(*a, "--tap") == 0)
|
|
|
|
|
|
__nmtst_internal.test_tap_log = TRUE;
|
2020-09-28 16:03:33 +02:00
|
|
|
|
}
|
2015-04-30 12:12:22 +02:00
|
|
|
|
}
|
2020-09-28 16:03:33 +02:00
|
|
|
|
|
nmtst: support -p and -s arguments from gtestutils via $NMTST_DEBUG
For tests based on glib's test framework, you can select which tests to
run by passing -p/-s on the command line.
Usually, we want to invoke our tests via `make check` which conveniently
calls valgrind (run-test-valgrind.sh) or spawns a private D-Bus server
(libnm-test-launch.sh, libnm-glib-test-launch.sh). At that point, it is
not directly possible to specify command line arguments for the tests,
which is why it is convenient to specify arguments via $NMTST_DEBUG
environment variable.
Parse "p" and "s" arguments from $NMTST_DEBUG and pass them to g_test_init()
to select which tests to run.
NMTST_DEBUG=p=/core/general/test_setting_ip4_changed_signal ./libnm-core/tests/test-general
However, there is a problem here: in gtestutils, -p/-s conflicts with --tap,
which is how our Makefile invokes the tests. Thus the new options explicitly
don't work when being called during `make check`. Which makes this much
less useful. I only noticed that afterwards, so still keep the patch
because it might still be convenient during developing tests to set the
environment variable once, and then repeatedly spawn the tests, without
specifying -p/-s.
2015-11-23 18:15:39 +01:00
|
|
|
|
if (!argc || g_test_initialized()) {
|
|
|
|
|
|
if (p_tests || s_tests) {
|
|
|
|
|
|
char *msg = g_strdup_printf(
|
|
|
|
|
|
">>> nmtst: ignore -p and -s options for test which calls g_test_init() itself");
|
2020-09-28 16:03:33 +02:00
|
|
|
|
|
nmtst: support -p and -s arguments from gtestutils via $NMTST_DEBUG
For tests based on glib's test framework, you can select which tests to
run by passing -p/-s on the command line.
Usually, we want to invoke our tests via `make check` which conveniently
calls valgrind (run-test-valgrind.sh) or spawns a private D-Bus server
(libnm-test-launch.sh, libnm-glib-test-launch.sh). At that point, it is
not directly possible to specify command line arguments for the tests,
which is why it is convenient to specify arguments via $NMTST_DEBUG
environment variable.
Parse "p" and "s" arguments from $NMTST_DEBUG and pass them to g_test_init()
to select which tests to run.
NMTST_DEBUG=p=/core/general/test_setting_ip4_changed_signal ./libnm-core/tests/test-general
However, there is a problem here: in gtestutils, -p/-s conflicts with --tap,
which is how our Makefile invokes the tests. Thus the new options explicitly
don't work when being called during `make check`. Which makes this much
less useful. I only noticed that afterwards, so still keep the patch
because it might still be convenient during developing tests to set the
environment variable once, and then repeatedly spawn the tests, without
specifying -p/-s.
2015-11-23 18:15:39 +01:00
|
|
|
|
g_array_append_val(debug_messages, msg);
|
|
|
|
|
|
}
|
|
|
|
|
|
} else {
|
2017-12-18 08:36:51 +01:00
|
|
|
|
/* We're intentionally assigning a value to static variables
|
|
|
|
|
|
* s_tests_x and p_tests_x without using it afterwards, just
|
|
|
|
|
|
* so that valgrind doesn't complain about the leak. */
|
|
|
|
|
|
NM_PRAGMA_WARNING_DISABLE("-Wunused-but-set-variable")
|
|
|
|
|
|
|
2015-11-23 17:40:44 +01:00
|
|
|
|
/* g_test_init() is a variadic function, so we cannot pass it
|
|
|
|
|
|
* (variadic) arguments. If you need to pass additional parameters,
|
|
|
|
|
|
* call nmtst_init() with argc==NULL and call g_test_init() yourself. */
|
|
|
|
|
|
|
|
|
|
|
|
/* g_test_init() sets g_log_set_always_fatal() for G_LOG_LEVEL_WARNING
|
|
|
|
|
|
* and G_LOG_LEVEL_CRITICAL. So, beware that the test will fail if you
|
|
|
|
|
|
* have any WARN or ERR log messages -- unless you g_test_expect_message(). */
|
2015-11-24 09:40:39 +01:00
|
|
|
|
GPtrArray * arg_array = g_ptr_array_new();
|
|
|
|
|
|
gs_free char **arg_array_c = NULL;
|
|
|
|
|
|
int arg_array_n, j;
|
nmtst: support -p and -s arguments from gtestutils via $NMTST_DEBUG
For tests based on glib's test framework, you can select which tests to
run by passing -p/-s on the command line.
Usually, we want to invoke our tests via `make check` which conveniently
calls valgrind (run-test-valgrind.sh) or spawns a private D-Bus server
(libnm-test-launch.sh, libnm-glib-test-launch.sh). At that point, it is
not directly possible to specify command line arguments for the tests,
which is why it is convenient to specify arguments via $NMTST_DEBUG
environment variable.
Parse "p" and "s" arguments from $NMTST_DEBUG and pass them to g_test_init()
to select which tests to run.
NMTST_DEBUG=p=/core/general/test_setting_ip4_changed_signal ./libnm-core/tests/test-general
However, there is a problem here: in gtestutils, -p/-s conflicts with --tap,
which is how our Makefile invokes the tests. Thus the new options explicitly
don't work when being called during `make check`. Which makes this much
less useful. I only noticed that afterwards, so still keep the patch
because it might still be convenient during developing tests to set the
environment variable once, and then repeatedly spawn the tests, without
specifying -p/-s.
2015-11-23 18:15:39 +01:00
|
|
|
|
static char ** s_tests_x, **p_tests_x;
|
2020-09-28 16:03:33 +02:00
|
|
|
|
|
2015-11-24 09:40:39 +01:00
|
|
|
|
if (*argc) {
|
|
|
|
|
|
for (i = 0; i < *argc; i++)
|
|
|
|
|
|
g_ptr_array_add(arg_array, (*argv)[i]);
|
|
|
|
|
|
} else
|
|
|
|
|
|
g_ptr_array_add(arg_array, "./test");
|
2020-09-28 16:03:33 +02:00
|
|
|
|
|
2015-11-24 09:40:39 +01:00
|
|
|
|
if (test_quick_set && !test_quick_argv)
|
|
|
|
|
|
g_ptr_array_add(arg_array, "-m=quick");
|
2020-09-28 16:03:33 +02:00
|
|
|
|
|
nmtst: support -p and -s arguments from gtestutils via $NMTST_DEBUG
For tests based on glib's test framework, you can select which tests to
run by passing -p/-s on the command line.
Usually, we want to invoke our tests via `make check` which conveniently
calls valgrind (run-test-valgrind.sh) or spawns a private D-Bus server
(libnm-test-launch.sh, libnm-glib-test-launch.sh). At that point, it is
not directly possible to specify command line arguments for the tests,
which is why it is convenient to specify arguments via $NMTST_DEBUG
environment variable.
Parse "p" and "s" arguments from $NMTST_DEBUG and pass them to g_test_init()
to select which tests to run.
NMTST_DEBUG=p=/core/general/test_setting_ip4_changed_signal ./libnm-core/tests/test-general
However, there is a problem here: in gtestutils, -p/-s conflicts with --tap,
which is how our Makefile invokes the tests. Thus the new options explicitly
don't work when being called during `make check`. Which makes this much
less useful. I only noticed that afterwards, so still keep the patch
because it might still be convenient during developing tests to set the
environment variable once, and then repeatedly spawn the tests, without
specifying -p/-s.
2015-11-23 18:15:39 +01:00
|
|
|
|
if (!__nmtst_internal.test_tap_log) {
|
|
|
|
|
|
for (i = 0; p_tests && i < p_tests->len; i++) {
|
|
|
|
|
|
g_ptr_array_add(arg_array, "-p");
|
|
|
|
|
|
g_ptr_array_add(arg_array, p_tests->pdata[i]);
|
|
|
|
|
|
}
|
|
|
|
|
|
for (i = 0; s_tests && i < s_tests->len; i++) {
|
|
|
|
|
|
g_ptr_array_add(arg_array, "-s");
|
|
|
|
|
|
g_ptr_array_add(arg_array, s_tests->pdata[i]);
|
|
|
|
|
|
}
|
|
|
|
|
|
} else if (p_tests || s_tests) {
|
|
|
|
|
|
char *msg = g_strdup_printf(">>> nmtst: ignore -p and -s options for tap-tests");
|
2020-09-28 16:03:33 +02:00
|
|
|
|
|
nmtst: support -p and -s arguments from gtestutils via $NMTST_DEBUG
For tests based on glib's test framework, you can select which tests to
run by passing -p/-s on the command line.
Usually, we want to invoke our tests via `make check` which conveniently
calls valgrind (run-test-valgrind.sh) or spawns a private D-Bus server
(libnm-test-launch.sh, libnm-glib-test-launch.sh). At that point, it is
not directly possible to specify command line arguments for the tests,
which is why it is convenient to specify arguments via $NMTST_DEBUG
environment variable.
Parse "p" and "s" arguments from $NMTST_DEBUG and pass them to g_test_init()
to select which tests to run.
NMTST_DEBUG=p=/core/general/test_setting_ip4_changed_signal ./libnm-core/tests/test-general
However, there is a problem here: in gtestutils, -p/-s conflicts with --tap,
which is how our Makefile invokes the tests. Thus the new options explicitly
don't work when being called during `make check`. Which makes this much
less useful. I only noticed that afterwards, so still keep the patch
because it might still be convenient during developing tests to set the
environment variable once, and then repeatedly spawn the tests, without
specifying -p/-s.
2015-11-23 18:15:39 +01:00
|
|
|
|
g_array_append_val(debug_messages, msg);
|
|
|
|
|
|
}
|
2020-09-28 16:03:33 +02:00
|
|
|
|
|
2015-11-24 09:40:39 +01:00
|
|
|
|
g_ptr_array_add(arg_array, NULL);
|
2020-09-28 16:03:33 +02:00
|
|
|
|
|
2015-11-24 09:40:39 +01:00
|
|
|
|
arg_array_n = arg_array->len - 1;
|
|
|
|
|
|
arg_array_c = (char **) g_ptr_array_free(arg_array, FALSE);
|
2020-09-28 16:03:33 +02:00
|
|
|
|
|
2015-11-24 09:40:39 +01:00
|
|
|
|
g_test_init(&arg_array_n, &arg_array_c, NULL);
|
2020-09-28 16:03:33 +02:00
|
|
|
|
|
2015-11-24 09:40:39 +01:00
|
|
|
|
if (*argc > 1) {
|
|
|
|
|
|
/* collaps argc/argv by removing the arguments detected
|
|
|
|
|
|
* by g_test_init(). */
|
|
|
|
|
|
for (i = 1, j = 1; i < *argc; i++) {
|
|
|
|
|
|
if ((*argv)[i] == arg_array_c[j])
|
|
|
|
|
|
j++;
|
|
|
|
|
|
else
|
|
|
|
|
|
(*argv)[i] = NULL;
|
|
|
|
|
|
}
|
|
|
|
|
|
for (i = 1, j = 1; i < *argc; i++) {
|
|
|
|
|
|
if ((*argv)[i]) {
|
|
|
|
|
|
(*argv)[j++] = (*argv)[i];
|
|
|
|
|
|
if (i >= j)
|
|
|
|
|
|
(*argv)[i] = NULL;
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
*argc = j;
|
|
|
|
|
|
}
|
2020-09-28 16:03:33 +02:00
|
|
|
|
|
nmtst: support -p and -s arguments from gtestutils via $NMTST_DEBUG
For tests based on glib's test framework, you can select which tests to
run by passing -p/-s on the command line.
Usually, we want to invoke our tests via `make check` which conveniently
calls valgrind (run-test-valgrind.sh) or spawns a private D-Bus server
(libnm-test-launch.sh, libnm-glib-test-launch.sh). At that point, it is
not directly possible to specify command line arguments for the tests,
which is why it is convenient to specify arguments via $NMTST_DEBUG
environment variable.
Parse "p" and "s" arguments from $NMTST_DEBUG and pass them to g_test_init()
to select which tests to run.
NMTST_DEBUG=p=/core/general/test_setting_ip4_changed_signal ./libnm-core/tests/test-general
However, there is a problem here: in gtestutils, -p/-s conflicts with --tap,
which is how our Makefile invokes the tests. Thus the new options explicitly
don't work when being called during `make check`. Which makes this much
less useful. I only noticed that afterwards, so still keep the patch
because it might still be convenient during developing tests to set the
environment variable once, and then repeatedly spawn the tests, without
specifying -p/-s.
2015-11-23 18:15:39 +01:00
|
|
|
|
/* we must "leak" the test paths because they are not cloned by g_test_init(). */
|
|
|
|
|
|
if (!__nmtst_internal.test_tap_log) {
|
|
|
|
|
|
if (p_tests) {
|
|
|
|
|
|
p_tests_x = (char **) g_ptr_array_free(p_tests, FALSE);
|
|
|
|
|
|
p_tests = NULL;
|
|
|
|
|
|
}
|
|
|
|
|
|
if (s_tests) {
|
|
|
|
|
|
s_tests_x = (char **) g_ptr_array_free(s_tests, FALSE);
|
|
|
|
|
|
s_tests = NULL;
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
2020-09-28 16:03:33 +02:00
|
|
|
|
|
2017-12-18 08:36:51 +01:00
|
|
|
|
NM_PRAGMA_WARNING_REENABLE
|
2015-11-23 17:40:44 +01:00
|
|
|
|
}
|
2020-09-28 16:03:33 +02:00
|
|
|
|
|
2015-04-30 12:12:22 +02:00
|
|
|
|
if (test_quick_set)
|
|
|
|
|
|
__nmtst_internal.test_quick = test_quick;
|
|
|
|
|
|
else if (test_quick_argv)
|
|
|
|
|
|
__nmtst_internal.test_quick = g_test_quick();
|
|
|
|
|
|
else {
|
|
|
|
|
|
#ifdef NMTST_TEST_QUICK
|
|
|
|
|
|
__nmtst_internal.test_quick = NMTST_TEST_QUICK;
|
|
|
|
|
|
#else
|
|
|
|
|
|
__nmtst_internal.test_quick = FALSE;
|
|
|
|
|
|
#endif
|
2014-04-17 10:49:01 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
__nmtst_internal.is_debug = is_debug;
|
2014-03-14 17:49:49 +01:00
|
|
|
|
__nmtst_internal.rand0 = g_rand_new_with_seed(0);
|
2014-04-23 16:54:54 +02:00
|
|
|
|
__nmtst_internal.sudo_cmd = sudo_cmd;
|
2014-04-25 15:34:49 +02:00
|
|
|
|
__nmtst_internal.no_expect_message = no_expect_message;
|
2014-04-14 12:03:05 +02:00
|
|
|
|
|
2014-04-17 10:49:01 +02:00
|
|
|
|
if (!log_level && log_domains) {
|
|
|
|
|
|
/* if the log level is not specified (but the domain is), we assume
|
|
|
|
|
|
* the caller wants to set it depending on is_debug */
|
|
|
|
|
|
log_level = is_debug ? "DEBUG" : "WARN";
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2014-04-24 21:01:58 +02:00
|
|
|
|
if (!__nmtst_internal.assert_logging) {
|
|
|
|
|
|
gboolean success = TRUE;
|
2016-05-17 14:04:28 +02:00
|
|
|
|
#ifdef _NMTST_INSIDE_CORE
|
2014-04-14 12:03:05 +02:00
|
|
|
|
success = nm_logging_setup(log_level, log_domains, NULL, NULL);
|
test: setup logging during nmtst_init_assert_logging()
Before, when having a test with nmtst_init_assert_logging(),
the caller was expected to setup logging separately according
to the log level that the test asserts against.
Since 5e74891b58688a19c43fb8e50880166d94a4e901, the logging
level can be reset via NMTST_DEBUG also for tests that
assert logging. In this case, it would be useful, if the test
would not overwrite the logging level that is set externally
via NMTST_DEBUG.
Instead, let the test pass the logging configuration to
nmtst_init_assert_logging(), and nmtst will setup logging
-- either according to NMTST_DEBUG or as passed in.
This way, setting the log level works also for no-expect-message
tests:
NMTST_DEBUG="debug,no-expect-message,log-level=TRACE" $TEST
2015-03-26 13:03:58 +01:00
|
|
|
|
*out_set_logging = TRUE;
|
2014-04-14 12:03:05 +02:00
|
|
|
|
#endif
|
|
|
|
|
|
g_assert(success);
|
shared: restore compat code in nm-glib.h for 2.32 compatibility
In commit 8a46b25cfa8c33daa8af37bb8103ca02286001b1, NetworkManager
bumped its glib dependency to 2.40 or newer.
"nm-glib.h" header is precisely the compatiblity implementation that we
use to cope with older glib versions. Note, that the same implementation
is also used by applet and VPN plugins.
However, applet and VPN plugins don't yet require 2.40 glib. Also,
they don't yet require NetworkManager 1.12.0 API (which was the one
that bumped the glib requirement to 2.40). Hence, when "nm-glib.h"
is used in applet or VPN, it must still cope with older versions,
although, the code is not used by NetworkManager itself.
Partly revert 8a46b25cfa8c33daa8af37bb8103ca02286001b1 so that nm-glib.h
again works for 2.32 or newer.
The same is true, also for "nm-test-utils.h", which is also used by
applet and VPN plugins.
2018-07-09 13:20:17 +02:00
|
|
|
|
#if GLIB_CHECK_VERSION(2, 34, 0)
|
2015-10-26 13:36:05 +01:00
|
|
|
|
if (__nmtst_internal.no_expect_message)
|
|
|
|
|
|
g_log_set_always_fatal(G_LOG_FATAL_MASK);
|
shared: restore compat code in nm-glib.h for 2.32 compatibility
In commit 8a46b25cfa8c33daa8af37bb8103ca02286001b1, NetworkManager
bumped its glib dependency to 2.40 or newer.
"nm-glib.h" header is precisely the compatiblity implementation that we
use to cope with older glib versions. Note, that the same implementation
is also used by applet and VPN plugins.
However, applet and VPN plugins don't yet require 2.40 glib. Also,
they don't yet require NetworkManager 1.12.0 API (which was the one
that bumped the glib requirement to 2.40). Hence, when "nm-glib.h"
is used in applet or VPN, it must still cope with older versions,
although, the code is not used by NetworkManager itself.
Partly revert 8a46b25cfa8c33daa8af37bb8103ca02286001b1 so that nm-glib.h
again works for 2.32 or newer.
The same is true, also for "nm-test-utils.h", which is also used by
applet and VPN plugins.
2018-07-09 13:20:17 +02:00
|
|
|
|
#else
|
|
|
|
|
|
/* g_test_expect_message() is a NOP, so allow any messages */
|
|
|
|
|
|
g_log_set_always_fatal(G_LOG_FATAL_MASK);
|
|
|
|
|
|
#endif
|
2014-04-25 15:34:49 +02:00
|
|
|
|
} else if (__nmtst_internal.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
|
|
|
|
|
|
* g_log_set_always_fatal(), which was set by g_test_init(). */
|
|
|
|
|
|
g_log_set_always_fatal(G_LOG_FATAL_MASK);
|
2016-05-17 14:04:28 +02:00
|
|
|
|
#ifdef _NMTST_INSIDE_CORE
|
2015-02-16 16:02:59 +01:00
|
|
|
|
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);
|
test: setup logging during nmtst_init_assert_logging()
Before, when having a test with nmtst_init_assert_logging(),
the caller was expected to setup logging separately according
to the log level that the test asserts against.
Since 5e74891b58688a19c43fb8e50880166d94a4e901, the logging
level can be reset via NMTST_DEBUG also for tests that
assert logging. In this case, it would be useful, if the test
would not overwrite the logging level that is set externally
via NMTST_DEBUG.
Instead, let the test pass the logging configuration to
nmtst_init_assert_logging(), and nmtst will setup logging
-- either according to NMTST_DEBUG or as passed in.
This way, setting the log level works also for no-expect-message
tests:
NMTST_DEBUG="debug,no-expect-message,log-level=TRACE" $TEST
2015-03-26 13:03:58 +01:00
|
|
|
|
*out_set_logging = TRUE;
|
2015-02-16 16:02:59 +01:00
|
|
|
|
g_assert(success);
|
|
|
|
|
|
}
|
|
|
|
|
|
#endif
|
2014-04-24 21:01:58 +02:00
|
|
|
|
} else {
|
shared: restore compat code in nm-glib.h for 2.32 compatibility
In commit 8a46b25cfa8c33daa8af37bb8103ca02286001b1, NetworkManager
bumped its glib dependency to 2.40 or newer.
"nm-glib.h" header is precisely the compatiblity implementation that we
use to cope with older glib versions. Note, that the same implementation
is also used by applet and VPN plugins.
However, applet and VPN plugins don't yet require 2.40 glib. Also,
they don't yet require NetworkManager 1.12.0 API (which was the one
that bumped the glib requirement to 2.40). Hence, when "nm-glib.h"
is used in applet or VPN, it must still cope with older versions,
although, the code is not used by NetworkManager itself.
Partly revert 8a46b25cfa8c33daa8af37bb8103ca02286001b1 so that nm-glib.h
again works for 2.32 or newer.
The same is true, also for "nm-test-utils.h", which is also used by
applet and VPN plugins.
2018-07-09 13:20:17 +02:00
|
|
|
|
#if GLIB_CHECK_VERSION(2, 34, 0)
|
2014-04-24 21:01:58 +02:00
|
|
|
|
/* We were called not to set logging levels. This means, that the user
|
2018-08-11 11:08:42 +02:00
|
|
|
|
* 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);
|
shared: restore compat code in nm-glib.h for 2.32 compatibility
In commit 8a46b25cfa8c33daa8af37bb8103ca02286001b1, NetworkManager
bumped its glib dependency to 2.40 or newer.
"nm-glib.h" header is precisely the compatiblity implementation that we
use to cope with older glib versions. Note, that the same implementation
is also used by applet and VPN plugins.
However, applet and VPN plugins don't yet require 2.40 glib. Also,
they don't yet require NetworkManager 1.12.0 API (which was the one
that bumped the glib requirement to 2.40). Hence, when "nm-glib.h"
is used in applet or VPN, it must still cope with older versions,
although, the code is not used by NetworkManager itself.
Partly revert 8a46b25cfa8c33daa8af37bb8103ca02286001b1 so that nm-glib.h
again works for 2.32 or newer.
The same is true, also for "nm-test-utils.h", which is also used by
applet and VPN plugins.
2018-07-09 13:20:17 +02:00
|
|
|
|
#else
|
|
|
|
|
|
/* g_test_expect_message() is a NOP, so allow any messages */
|
|
|
|
|
|
g_log_set_always_fatal(G_LOG_FATAL_MASK);
|
|
|
|
|
|
#endif
|
2014-04-14 12:03:05 +02:00
|
|
|
|
}
|
2020-09-28 16:03:33 +02:00
|
|
|
|
|
2014-04-25 15:34:49 +02:00
|
|
|
|
if ((!__nmtst_internal.assert_logging
|
|
|
|
|
|
|| (__nmtst_internal.assert_logging && __nmtst_internal.no_expect_message))
|
2015-03-27 12:27:48 +01:00
|
|
|
|
&& (is_debug
|
|
|
|
|
|
|| (c_log_level
|
|
|
|
|
|
&& (!g_ascii_strcasecmp(c_log_level, "DEBUG")
|
|
|
|
|
|
|| !g_ascii_strcasecmp(c_log_level, "TRACE"))))
|
2014-04-25 14:17:07 +02:00
|
|
|
|
&& !g_getenv("G_MESSAGES_DEBUG")) {
|
|
|
|
|
|
/* if we are @is_debug or @log_level=="DEBUG" and
|
|
|
|
|
|
* G_MESSAGES_DEBUG is unset, we set G_MESSAGES_DEBUG=all.
|
|
|
|
|
|
* To disable this default behaviour, set G_MESSAGES_DEBUG='' */
|
|
|
|
|
|
|
|
|
|
|
|
/* Note that g_setenv is not thread safe, but you should anyway call
|
|
|
|
|
|
* nmtst_init() at the very start. */
|
|
|
|
|
|
g_setenv("G_MESSAGES_DEBUG", "all", TRUE);
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2014-04-17 10:49:01 +02:00
|
|
|
|
/* Delay messages until we setup logging. */
|
|
|
|
|
|
for (i = 0; i < debug_messages->len; i++)
|
2014-04-24 21:01:58 +02:00
|
|
|
|
__NMTST_LOG(g_message, "%s", g_array_index(debug_messages, const char *, i));
|
2014-04-17 10:49:01 +02:00
|
|
|
|
|
|
|
|
|
|
g_strfreev((char **) g_array_free(debug_messages, FALSE));
|
|
|
|
|
|
g_free(c_log_level);
|
|
|
|
|
|
g_free(c_log_domains);
|
2014-04-23 17:12:45 +02:00
|
|
|
|
|
all: fix up multiple-include-guard defines
Previously, src/nm-ip4-config.h, libnm/nm-ip4-config.h, and
libnm-glib/nm-ip4-config.h all used "NM_IP4_CONFIG_H" as an include
guard, which meant that nm-test-utils.h could not tell which of them
was being included (and so, eg, if you tried to include
nm-ip4-config.h in a libnm test, it would fail to compile because
nm-test-utils.h was referring to symbols in src/nm-ip4-config.h).
Fix this by changing the include guards in the non-API-stable parts of
the tree:
- libnm-glib/nm-ip4-config.h remains NM_IP4_CONFIG_H
- libnm/nm-ip4-config.h now uses __NM_IP4_CONFIG_H__
- src/nm-ip4-config.h now uses __NETWORKMANAGER_IP4_CONFIG_H__
And likewise for all other headers.
The two non-"nm"-prefixed headers, libnm/NetworkManager.h and
src/NetworkManagerUtils.h are now __NETWORKMANAGER_H__ and
__NETWORKMANAGER_UTILS_H__ respectively, which, while not entirely
consistent with the general scheme, do still mostly make sense in
isolation.
2014-08-13 14:10:11 -04:00
|
|
|
|
#ifdef __NETWORKMANAGER_UTILS_H__
|
2014-07-10 13:25:57 +02:00
|
|
|
|
/* ensure that monotonic timestamp is called (because it initially logs a line) */
|
2019-12-13 16:54:30 +01:00
|
|
|
|
nm_utils_get_monotonic_timestamp_sec();
|
2014-07-10 13:25:57 +02:00
|
|
|
|
#endif
|
2015-10-10 19:34:06 +02:00
|
|
|
|
|
|
|
|
|
|
#ifdef NM_UTILS_H
|
|
|
|
|
|
{
|
|
|
|
|
|
gs_free_error GError *error = NULL;
|
|
|
|
|
|
|
|
|
|
|
|
if (!nm_utils_init(&error))
|
|
|
|
|
|
g_assert_not_reached();
|
|
|
|
|
|
g_assert_no_error(error);
|
|
|
|
|
|
}
|
|
|
|
|
|
#endif
|
2017-08-06 12:10:06 +02:00
|
|
|
|
|
|
|
|
|
|
g_log_set_handler(G_LOG_DOMAIN,
|
|
|
|
|
|
G_LOG_LEVEL_MASK | G_LOG_FLAG_FATAL | G_LOG_FLAG_RECURSION,
|
|
|
|
|
|
_nmtst_log_handler,
|
|
|
|
|
|
NULL);
|
2014-04-17 10:49:01 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
2016-05-17 14:04:28 +02:00
|
|
|
|
#ifndef _NMTST_INSIDE_CORE
|
2017-02-23 15:24:18 +01:00
|
|
|
|
static inline void
|
2014-04-24 21:01:58 +02:00
|
|
|
|
nmtst_init(int *argc, char ***argv, gboolean assert_logging)
|
|
|
|
|
|
{
|
test: setup logging during nmtst_init_assert_logging()
Before, when having a test with nmtst_init_assert_logging(),
the caller was expected to setup logging separately according
to the log level that the test asserts against.
Since 5e74891b58688a19c43fb8e50880166d94a4e901, the logging
level can be reset via NMTST_DEBUG also for tests that
assert logging. In this case, it would be useful, if the test
would not overwrite the logging level that is set externally
via NMTST_DEBUG.
Instead, let the test pass the logging configuration to
nmtst_init_assert_logging(), and nmtst will setup logging
-- either according to NMTST_DEBUG or as passed in.
This way, setting the log level works also for no-expect-message
tests:
NMTST_DEBUG="debug,no-expect-message,log-level=TRACE" $TEST
2015-03-26 13:03:58 +01:00
|
|
|
|
__nmtst_init(argc, argv, assert_logging, NULL, NULL, NULL);
|
2014-04-24 21:01:58 +02:00
|
|
|
|
}
|
|
|
|
|
|
#endif
|
|
|
|
|
|
|
2017-02-23 15:24:18 +01:00
|
|
|
|
static inline gboolean
|
2014-04-17 10:49:01 +02:00
|
|
|
|
nmtst_is_debug(void)
|
|
|
|
|
|
{
|
|
|
|
|
|
g_assert(nmtst_initialized());
|
|
|
|
|
|
return __nmtst_internal.is_debug;
|
2014-03-14 17:49:49 +01:00
|
|
|
|
}
|
|
|
|
|
|
|
2017-02-23 15:24:18 +01:00
|
|
|
|
static inline gboolean
|
2015-04-30 12:12:22 +02:00
|
|
|
|
nmtst_test_quick(void)
|
|
|
|
|
|
{
|
|
|
|
|
|
g_assert(nmtst_initialized());
|
|
|
|
|
|
return __nmtst_internal.test_quick;
|
|
|
|
|
|
}
|
2020-09-28 16:03:33 +02:00
|
|
|
|
|
shared: restore compat code in nm-glib.h for 2.32 compatibility
In commit 8a46b25cfa8c33daa8af37bb8103ca02286001b1, NetworkManager
bumped its glib dependency to 2.40 or newer.
"nm-glib.h" header is precisely the compatiblity implementation that we
use to cope with older glib versions. Note, that the same implementation
is also used by applet and VPN plugins.
However, applet and VPN plugins don't yet require 2.40 glib. Also,
they don't yet require NetworkManager 1.12.0 API (which was the one
that bumped the glib requirement to 2.40). Hence, when "nm-glib.h"
is used in applet or VPN, it must still cope with older versions,
although, the code is not used by NetworkManager itself.
Partly revert 8a46b25cfa8c33daa8af37bb8103ca02286001b1 so that nm-glib.h
again works for 2.32 or newer.
The same is true, also for "nm-test-utils.h", which is also used by
applet and VPN plugins.
2018-07-09 13:20:17 +02:00
|
|
|
|
#if GLIB_CHECK_VERSION(2, 34, 0)
|
2014-04-25 15:34:49 +02:00
|
|
|
|
#undef g_test_expect_message
|
|
|
|
|
|
#define g_test_expect_message(...) \
|
|
|
|
|
|
G_STMT_START \
|
|
|
|
|
|
{ \
|
|
|
|
|
|
g_assert(nmtst_initialized()); \
|
|
|
|
|
|
if (__nmtst_internal.assert_logging && __nmtst_internal.no_expect_message) { \
|
2015-04-09 15:35:00 +02:00
|
|
|
|
g_debug("nmtst: assert-logging: g_test_expect_message %s", \
|
|
|
|
|
|
G_STRINGIFY((__VA_ARGS__))); \
|
2014-04-25 15:34:49 +02:00
|
|
|
|
} else { \
|
shared: restore compat code in nm-glib.h for 2.32 compatibility
In commit 8a46b25cfa8c33daa8af37bb8103ca02286001b1, NetworkManager
bumped its glib dependency to 2.40 or newer.
"nm-glib.h" header is precisely the compatiblity implementation that we
use to cope with older glib versions. Note, that the same implementation
is also used by applet and VPN plugins.
However, applet and VPN plugins don't yet require 2.40 glib. Also,
they don't yet require NetworkManager 1.12.0 API (which was the one
that bumped the glib requirement to 2.40). Hence, when "nm-glib.h"
is used in applet or VPN, it must still cope with older versions,
although, the code is not used by NetworkManager itself.
Partly revert 8a46b25cfa8c33daa8af37bb8103ca02286001b1 so that nm-glib.h
again works for 2.32 or newer.
The same is true, also for "nm-test-utils.h", which is also used by
applet and VPN plugins.
2018-07-09 13:20:17 +02:00
|
|
|
|
G_GNUC_BEGIN_IGNORE_DEPRECATIONS \
|
2014-04-25 15:34:49 +02:00
|
|
|
|
g_test_expect_message(__VA_ARGS__); \
|
shared: restore compat code in nm-glib.h for 2.32 compatibility
In commit 8a46b25cfa8c33daa8af37bb8103ca02286001b1, NetworkManager
bumped its glib dependency to 2.40 or newer.
"nm-glib.h" header is precisely the compatiblity implementation that we
use to cope with older glib versions. Note, that the same implementation
is also used by applet and VPN plugins.
However, applet and VPN plugins don't yet require 2.40 glib. Also,
they don't yet require NetworkManager 1.12.0 API (which was the one
that bumped the glib requirement to 2.40). Hence, when "nm-glib.h"
is used in applet or VPN, it must still cope with older versions,
although, the code is not used by NetworkManager itself.
Partly revert 8a46b25cfa8c33daa8af37bb8103ca02286001b1 so that nm-glib.h
again works for 2.32 or newer.
The same is true, also for "nm-test-utils.h", which is also used by
applet and VPN plugins.
2018-07-09 13:20:17 +02:00
|
|
|
|
G_GNUC_END_IGNORE_DEPRECATIONS \
|
2020-09-28 16:03:33 +02:00
|
|
|
|
} \
|
2014-04-25 15:34:49 +02:00
|
|
|
|
} \
|
|
|
|
|
|
G_STMT_END
|
2015-04-09 15:35:00 +02:00
|
|
|
|
#undef g_test_assert_expected_messages_internal
|
|
|
|
|
|
#define g_test_assert_expected_messages_internal(domain, file, line, func) \
|
|
|
|
|
|
G_STMT_START \
|
|
|
|
|
|
{ \
|
2015-04-10 14:58:03 +02:00
|
|
|
|
const char *_domain = (domain); \
|
|
|
|
|
|
const char *_file = (file); \
|
|
|
|
|
|
const char *_func = (func); \
|
|
|
|
|
|
int _line = (line); \
|
|
|
|
|
|
\
|
2015-04-09 15:35:00 +02:00
|
|
|
|
if (__nmtst_internal.assert_logging && __nmtst_internal.no_expect_message) \
|
2015-04-10 14:58:03 +02:00
|
|
|
|
g_debug("nmtst: assert-logging: g_test_assert_expected_messages(%s, %s:%d, %s)", \
|
|
|
|
|
|
_domain ?: "", \
|
|
|
|
|
|
_file ?: "", \
|
|
|
|
|
|
_line, \
|
|
|
|
|
|
_func ?: ""); \
|
2015-04-09 15:35:00 +02:00
|
|
|
|
\
|
shared: restore compat code in nm-glib.h for 2.32 compatibility
In commit 8a46b25cfa8c33daa8af37bb8103ca02286001b1, NetworkManager
bumped its glib dependency to 2.40 or newer.
"nm-glib.h" header is precisely the compatiblity implementation that we
use to cope with older glib versions. Note, that the same implementation
is also used by applet and VPN plugins.
However, applet and VPN plugins don't yet require 2.40 glib. Also,
they don't yet require NetworkManager 1.12.0 API (which was the one
that bumped the glib requirement to 2.40). Hence, when "nm-glib.h"
is used in applet or VPN, it must still cope with older versions,
although, the code is not used by NetworkManager itself.
Partly revert 8a46b25cfa8c33daa8af37bb8103ca02286001b1 so that nm-glib.h
again works for 2.32 or newer.
The same is true, also for "nm-test-utils.h", which is also used by
applet and VPN plugins.
2018-07-09 13:20:17 +02:00
|
|
|
|
G_GNUC_BEGIN_IGNORE_DEPRECATIONS \
|
2015-04-10 14:58:03 +02:00
|
|
|
|
g_test_assert_expected_messages_internal(_domain, _file, _line, _func); \
|
shared: restore compat code in nm-glib.h for 2.32 compatibility
In commit 8a46b25cfa8c33daa8af37bb8103ca02286001b1, NetworkManager
bumped its glib dependency to 2.40 or newer.
"nm-glib.h" header is precisely the compatiblity implementation that we
use to cope with older glib versions. Note, that the same implementation
is also used by applet and VPN plugins.
However, applet and VPN plugins don't yet require 2.40 glib. Also,
they don't yet require NetworkManager 1.12.0 API (which was the one
that bumped the glib requirement to 2.40). Hence, when "nm-glib.h"
is used in applet or VPN, it must still cope with older versions,
although, the code is not used by NetworkManager itself.
Partly revert 8a46b25cfa8c33daa8af37bb8103ca02286001b1 so that nm-glib.h
again works for 2.32 or newer.
The same is true, also for "nm-test-utils.h", which is also used by
applet and VPN plugins.
2018-07-09 13:20:17 +02:00
|
|
|
|
G_GNUC_END_IGNORE_DEPRECATIONS \
|
2015-04-09 15:35:00 +02:00
|
|
|
|
} \
|
|
|
|
|
|
G_STMT_END
|
shared: restore compat code in nm-glib.h for 2.32 compatibility
In commit 8a46b25cfa8c33daa8af37bb8103ca02286001b1, NetworkManager
bumped its glib dependency to 2.40 or newer.
"nm-glib.h" header is precisely the compatiblity implementation that we
use to cope with older glib versions. Note, that the same implementation
is also used by applet and VPN plugins.
However, applet and VPN plugins don't yet require 2.40 glib. Also,
they don't yet require NetworkManager 1.12.0 API (which was the one
that bumped the glib requirement to 2.40). Hence, when "nm-glib.h"
is used in applet or VPN, it must still cope with older versions,
although, the code is not used by NetworkManager itself.
Partly revert 8a46b25cfa8c33daa8af37bb8103ca02286001b1 so that nm-glib.h
again works for 2.32 or newer.
The same is true, also for "nm-test-utils.h", which is also used by
applet and VPN plugins.
2018-07-09 13:20:17 +02:00
|
|
|
|
#endif
|
2014-04-25 15:34:49 +02:00
|
|
|
|
|
2018-01-02 12:13:00 +01:00
|
|
|
|
#define NMTST_EXPECT(domain, level, msg) g_test_expect_message(domain, level, msg)
|
|
|
|
|
|
|
|
|
|
|
|
#define NMTST_EXPECT_LIBNM(level, msg) NMTST_EXPECT("libnm", level, msg)
|
|
|
|
|
|
|
2018-09-08 16:13:01 +02:00
|
|
|
|
#define NMTST_EXPECT_LIBNM_WARNING(msg) NMTST_EXPECT_LIBNM(G_LOG_LEVEL_WARNING, msg)
|
2018-01-02 12:13:00 +01:00
|
|
|
|
#define NMTST_EXPECT_LIBNM_CRITICAL(msg) NMTST_EXPECT_LIBNM(G_LOG_LEVEL_CRITICAL, msg)
|
|
|
|
|
|
|
2016-02-03 15:01:04 +01:00
|
|
|
|
/*****************************************************************************/
|
|
|
|
|
|
|
|
|
|
|
|
typedef struct _NmtstTestData NmtstTestData;
|
|
|
|
|
|
|
2017-05-25 21:48:50 +02:00
|
|
|
|
typedef void (*NmtstTestHandler)(const NmtstTestData *test_data);
|
2016-02-03 15:01:04 +01:00
|
|
|
|
|
|
|
|
|
|
struct _NmtstTestData {
|
2017-05-25 21:48:50 +02:00
|
|
|
|
union {
|
|
|
|
|
|
const char *testpath;
|
|
|
|
|
|
char * _testpath;
|
|
|
|
|
|
};
|
2016-02-03 15:01:04 +01:00
|
|
|
|
gsize n_args;
|
2017-05-25 21:48:50 +02:00
|
|
|
|
gpointer * args;
|
|
|
|
|
|
NmtstTestHandler _func_setup;
|
|
|
|
|
|
GTestDataFunc _func_test;
|
|
|
|
|
|
NmtstTestHandler _func_teardown;
|
2016-02-03 15:01:04 +01:00
|
|
|
|
};
|
|
|
|
|
|
|
2017-02-23 15:24:18 +01:00
|
|
|
|
static inline void
|
2016-02-09 12:15:49 +01:00
|
|
|
|
_nmtst_test_data_unpack(const NmtstTestData *test_data, gsize n_args, ...)
|
2016-02-03 15:01:04 +01:00
|
|
|
|
{
|
|
|
|
|
|
gsize i;
|
|
|
|
|
|
va_list ap;
|
|
|
|
|
|
gpointer *p;
|
|
|
|
|
|
|
|
|
|
|
|
g_assert(test_data);
|
|
|
|
|
|
g_assert_cmpint(n_args, ==, test_data->n_args);
|
|
|
|
|
|
|
|
|
|
|
|
va_start(ap, n_args);
|
|
|
|
|
|
for (i = 0; i < n_args; i++) {
|
|
|
|
|
|
p = va_arg(ap, gpointer *);
|
|
|
|
|
|
|
2017-05-25 21:48:50 +02:00
|
|
|
|
if (p)
|
|
|
|
|
|
*p = test_data->args[i];
|
2016-02-03 15:01:04 +01:00
|
|
|
|
}
|
|
|
|
|
|
va_end(ap);
|
|
|
|
|
|
}
|
2016-02-09 12:15:49 +01:00
|
|
|
|
#define nmtst_test_data_unpack(test_data, ...) \
|
|
|
|
|
|
_nmtst_test_data_unpack(test_data, NM_NARG(__VA_ARGS__), ##__VA_ARGS__)
|
2016-02-03 15:01:04 +01:00
|
|
|
|
|
2017-02-23 15:24:18 +01:00
|
|
|
|
static inline void
|
2016-02-03 15:01:04 +01:00
|
|
|
|
_nmtst_test_data_free(gpointer data)
|
|
|
|
|
|
{
|
|
|
|
|
|
NmtstTestData *test_data = data;
|
|
|
|
|
|
|
|
|
|
|
|
g_assert(test_data);
|
|
|
|
|
|
|
2017-05-25 21:48:50 +02:00
|
|
|
|
g_free(test_data->_testpath);
|
2016-02-03 15:01:04 +01:00
|
|
|
|
g_free(test_data);
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2017-02-23 15:24:18 +01:00
|
|
|
|
static inline void
|
2017-05-25 21:48:50 +02:00
|
|
|
|
_nmtst_test_run(gconstpointer data)
|
|
|
|
|
|
{
|
|
|
|
|
|
const NmtstTestData *test_data = data;
|
|
|
|
|
|
|
|
|
|
|
|
if (test_data->_func_setup)
|
|
|
|
|
|
test_data->_func_setup(test_data);
|
|
|
|
|
|
|
|
|
|
|
|
test_data->_func_test(test_data);
|
|
|
|
|
|
|
|
|
|
|
|
if (test_data->_func_teardown)
|
|
|
|
|
|
test_data->_func_teardown(test_data);
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static inline void
|
|
|
|
|
|
_nmtst_add_test_func_full(const char * testpath,
|
|
|
|
|
|
GTestDataFunc func_test,
|
|
|
|
|
|
NmtstTestHandler func_setup,
|
|
|
|
|
|
NmtstTestHandler func_teardown,
|
|
|
|
|
|
gsize n_args,
|
|
|
|
|
|
...)
|
2016-02-03 15:01:04 +01:00
|
|
|
|
{
|
|
|
|
|
|
gsize i;
|
|
|
|
|
|
NmtstTestData *data;
|
|
|
|
|
|
va_list ap;
|
2020-09-28 16:03:33 +02:00
|
|
|
|
|
2017-05-25 21:48:50 +02:00
|
|
|
|
g_assert(testpath && testpath[0]);
|
|
|
|
|
|
g_assert(func_test);
|
2020-09-28 16:03:33 +02:00
|
|
|
|
|
2017-05-25 21:48:50 +02:00
|
|
|
|
data = g_malloc0(sizeof(NmtstTestData) + (sizeof(gpointer) * (n_args + 1)));
|
2020-09-28 16:03:33 +02:00
|
|
|
|
|
2017-05-25 21:48:50 +02:00
|
|
|
|
data->_testpath = g_strdup(testpath);
|
|
|
|
|
|
data->_func_test = func_test;
|
|
|
|
|
|
data->_func_setup = func_setup;
|
|
|
|
|
|
data->_func_teardown = func_teardown;
|
2016-02-03 15:01:04 +01:00
|
|
|
|
data->n_args = n_args;
|
2017-05-25 21:48:50 +02:00
|
|
|
|
data->args = (gpointer) &data[1];
|
2016-02-03 15:01:04 +01:00
|
|
|
|
va_start(ap, n_args);
|
|
|
|
|
|
for (i = 0; i < n_args; i++)
|
|
|
|
|
|
data->args[i] = va_arg(ap, gpointer);
|
|
|
|
|
|
data->args[i] = NULL;
|
|
|
|
|
|
va_end(ap);
|
2020-09-28 16:03:33 +02:00
|
|
|
|
|
2017-05-25 21:48:50 +02:00
|
|
|
|
g_test_add_data_func_full(testpath, data, _nmtst_test_run, _nmtst_test_data_free);
|
2020-09-28 16:03:33 +02:00
|
|
|
|
}
|
2017-05-25 21:48:50 +02:00
|
|
|
|
#define nmtst_add_test_func_full(testpath, func_test, func_setup, func_teardown, ...) \
|
|
|
|
|
|
_nmtst_add_test_func_full(testpath, \
|
|
|
|
|
|
func_test, \
|
|
|
|
|
|
func_setup, \
|
|
|
|
|
|
func_teardown, \
|
|
|
|
|
|
NM_NARG(__VA_ARGS__), \
|
|
|
|
|
|
##__VA_ARGS__)
|
|
|
|
|
|
#define nmtst_add_test_func(testpath, func_test, ...) \
|
|
|
|
|
|
nmtst_add_test_func_full(testpath, func_test, NULL, NULL, ##__VA_ARGS__)
|
2016-02-03 15:01:04 +01:00
|
|
|
|
|
|
|
|
|
|
/*****************************************************************************/
|
|
|
|
|
|
|
2017-02-23 15:24:18 +01:00
|
|
|
|
static inline GRand *
|
2014-10-29 10:44:31 +01:00
|
|
|
|
nmtst_get_rand0(void)
|
2014-03-14 17:49:49 +01:00
|
|
|
|
{
|
2014-04-17 10:47:48 +02:00
|
|
|
|
g_assert(nmtst_initialized());
|
2014-03-14 17:49:49 +01:00
|
|
|
|
return __nmtst_internal.rand0;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2017-02-23 15:24:18 +01:00
|
|
|
|
static inline GRand *
|
2014-10-29 10:44:31 +01:00
|
|
|
|
nmtst_get_rand(void)
|
2014-03-14 17:49:49 +01:00
|
|
|
|
{
|
2014-04-17 10:47:48 +02:00
|
|
|
|
g_assert(nmtst_initialized());
|
|
|
|
|
|
|
2014-03-14 17:49:49 +01:00
|
|
|
|
if (G_UNLIKELY(!__nmtst_internal.rand)) {
|
|
|
|
|
|
guint32 seed;
|
2018-07-24 15:54:29 +02:00
|
|
|
|
const char *str = g_getenv("NMTST_SEED_RAND");
|
2014-03-14 17:49:49 +01:00
|
|
|
|
|
2018-07-24 15:54:29 +02:00
|
|
|
|
if (!str) {
|
|
|
|
|
|
/* No NMTST_SEED_RAND. Pick a stable one. */
|
|
|
|
|
|
seed = 0;
|
|
|
|
|
|
__nmtst_internal.rand = g_rand_new_with_seed(seed);
|
|
|
|
|
|
} else if (str[0] == '\0') {
|
|
|
|
|
|
/* NMTST_SEED_RAND is set but empty. Pick a random one. */
|
|
|
|
|
|
__nmtst_internal.rand = g_rand_new();
|
|
|
|
|
|
|
|
|
|
|
|
seed = g_rand_int(__nmtst_internal.rand);
|
|
|
|
|
|
g_rand_set_seed(__nmtst_internal.rand, seed);
|
|
|
|
|
|
} else {
|
|
|
|
|
|
/* NMTST_SEED_RAND is set. Use it as a seed. */
|
all: don't use gchar/gshort/gint/glong but C types
We commonly don't use the glib typedefs for char/short/int/long,
but their C types directly.
$ git grep '\<g\(char\|short\|int\|long\|float\|double\)\>' | wc -l
587
$ git grep '\<\(char\|short\|int\|long\|float\|double\)\>' | wc -l
21114
One could argue that using the glib typedefs is preferable in
public API (of our glib based libnm library) or where it clearly
is related to glib, like during
g_object_set (obj, PROPERTY, (gint) value, NULL);
However, that argument does not seem strong, because in practice we don't
follow that argument today, and seldomly use the glib typedefs.
Also, the style guide for this would be hard to formalize, because
"using them where clearly related to a glib" is a very loose suggestion.
Also note that glib typedefs will always just be typedefs of the
underlying C types. There is no danger of glib changing the meaning
of these typedefs (because that would be a major API break of glib).
A simple style guide is instead: don't use these typedefs.
No manual actions, I only ran the bash script:
FILES=($(git ls-files '*.[hc]'))
sed -i \
-e 's/\<g\(char\|short\|int\|long\|float\|double\)\>\( [^ ]\)/\1\2/g' \
-e 's/\<g\(char\|short\|int\|long\|float\|double\)\> /\1 /g' \
-e 's/\<g\(char\|short\|int\|long\|float\|double\)\>/\1/g' \
"${FILES[@]}"
2018-07-11 07:40:19 +02:00
|
|
|
|
char * s;
|
2014-03-14 17:49:49 +01:00
|
|
|
|
gint64 i;
|
|
|
|
|
|
|
|
|
|
|
|
i = g_ascii_strtoll(str, &s, 0);
|
2015-03-27 12:13:38 +01:00
|
|
|
|
g_assert(s[0] == '\0' && i >= 0 && i < G_MAXUINT32);
|
2014-03-14 17:49:49 +01:00
|
|
|
|
|
|
|
|
|
|
seed = i;
|
|
|
|
|
|
__nmtst_internal.rand = g_rand_new_with_seed(seed);
|
|
|
|
|
|
}
|
|
|
|
|
|
__nmtst_internal.rand_seed = seed;
|
|
|
|
|
|
|
2015-04-10 13:27:53 +02:00
|
|
|
|
g_print("\nnmtst: initialize nmtst_get_rand() with NMTST_SEED_RAND=%u\n", seed);
|
2014-03-14 17:49:49 +01:00
|
|
|
|
}
|
|
|
|
|
|
return __nmtst_internal.rand;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2017-02-23 15:24:18 +01:00
|
|
|
|
static inline guint32
|
2019-05-30 08:33:14 +02:00
|
|
|
|
nmtst_get_rand_uint32(void)
|
2015-10-13 19:48:17 +02:00
|
|
|
|
{
|
|
|
|
|
|
return g_rand_int(nmtst_get_rand());
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2020-01-04 17:24:19 +01:00
|
|
|
|
static inline guint64
|
|
|
|
|
|
nmtst_get_rand_uint64(void)
|
|
|
|
|
|
{
|
|
|
|
|
|
GRand *rand = nmtst_get_rand();
|
|
|
|
|
|
|
|
|
|
|
|
return (((guint64) g_rand_int(rand))) | (((guint64) g_rand_int(rand)) << 32);
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2019-05-30 08:30:29 +02:00
|
|
|
|
static inline guint
|
|
|
|
|
|
nmtst_get_rand_uint(void)
|
|
|
|
|
|
{
|
2020-10-21 16:49:46 +02:00
|
|
|
|
G_STATIC_ASSERT_EXPR((sizeof(guint) == sizeof(guint32) || (sizeof(guint) == sizeof(guint64))));
|
|
|
|
|
|
if (sizeof(guint32) == sizeof(guint))
|
|
|
|
|
|
return nmtst_get_rand_uint32();
|
|
|
|
|
|
return nmtst_get_rand_uint64();
|
2019-05-30 08:30:29 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
2020-03-26 08:37:35 +01:00
|
|
|
|
static inline gsize
|
|
|
|
|
|
nmtst_get_rand_size(void)
|
|
|
|
|
|
{
|
2020-10-21 16:49:46 +02:00
|
|
|
|
G_STATIC_ASSERT_EXPR((sizeof(gsize) == sizeof(guint32) || (sizeof(gsize) == sizeof(guint64))));
|
2020-03-26 08:37:35 +01:00
|
|
|
|
if (sizeof(gsize) == sizeof(guint32))
|
|
|
|
|
|
return nmtst_get_rand_uint32();
|
|
|
|
|
|
return nmtst_get_rand_uint64();
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2018-04-05 14:02:03 +02:00
|
|
|
|
static inline gboolean
|
|
|
|
|
|
nmtst_get_rand_bool(void)
|
|
|
|
|
|
{
|
2019-05-30 08:33:14 +02:00
|
|
|
|
return nmtst_get_rand_uint32() % 2;
|
2018-04-05 14:02:03 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
2020-10-21 16:49:46 +02:00
|
|
|
|
static inline gboolean
|
|
|
|
|
|
nmtst_get_rand_one_case_in(guint32 num)
|
|
|
|
|
|
{
|
|
|
|
|
|
/* num=1 doesn't make much sense, because it will always return %TRUE.
|
|
|
|
|
|
* Still accept it, it might be that @num is calculated, so 1 might be
|
|
|
|
|
|
* a valid edge case. */
|
|
|
|
|
|
g_assert(num > 0);
|
|
|
|
|
|
|
|
|
|
|
|
return (nmtst_get_rand_uint32() % num) == 0;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2017-02-23 15:24:18 +01:00
|
|
|
|
static inline gpointer
|
2016-04-06 16:53:02 +02:00
|
|
|
|
nmtst_rand_buf(GRand *rand, gpointer buffer, gsize buffer_length)
|
|
|
|
|
|
{
|
|
|
|
|
|
guint32 v;
|
|
|
|
|
|
guint8 *b = buffer;
|
|
|
|
|
|
|
|
|
|
|
|
if (!buffer_length)
|
|
|
|
|
|
return buffer;
|
|
|
|
|
|
|
|
|
|
|
|
g_assert(buffer);
|
|
|
|
|
|
|
|
|
|
|
|
if (!rand)
|
|
|
|
|
|
rand = nmtst_get_rand();
|
|
|
|
|
|
|
|
|
|
|
|
for (; buffer_length >= sizeof(guint32);
|
|
|
|
|
|
buffer_length -= sizeof(guint32), b += sizeof(guint32)) {
|
|
|
|
|
|
v = g_rand_int(rand);
|
|
|
|
|
|
memcpy(b, &v, sizeof(guint32));
|
|
|
|
|
|
}
|
|
|
|
|
|
if (buffer_length > 0) {
|
|
|
|
|
|
v = g_rand_int(rand);
|
|
|
|
|
|
do {
|
|
|
|
|
|
*(b++) = v & 0xFF;
|
|
|
|
|
|
v >>= 8;
|
|
|
|
|
|
} while (--buffer_length > 0);
|
|
|
|
|
|
}
|
|
|
|
|
|
return buffer;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2019-01-03 13:22:01 +01:00
|
|
|
|
#define _nmtst_rand_select(uniq, v0, ...) \
|
|
|
|
|
|
({ \
|
|
|
|
|
|
typeof(v0) NM_UNIQ_T(UNIQ, uniq)[1 + NM_NARG(__VA_ARGS__)] = {(v0), __VA_ARGS__}; \
|
|
|
|
|
|
\
|
2019-05-30 08:33:14 +02:00
|
|
|
|
NM_UNIQ_T(UNIQ, uniq)[nmtst_get_rand_uint32() % G_N_ELEMENTS(NM_UNIQ_T(UNIQ, uniq))]; \
|
2019-01-03 13:22:01 +01:00
|
|
|
|
})
|
|
|
|
|
|
|
|
|
|
|
|
#define nmtst_rand_select(...) _nmtst_rand_select(NM_UNIQ, __VA_ARGS__)
|
|
|
|
|
|
|
2017-02-23 15:24:18 +01:00
|
|
|
|
static inline void *
|
2015-10-22 16:14:45 +02:00
|
|
|
|
nmtst_rand_perm(GRand *rand, void *dst, const void *src, gsize elmt_size, gsize n_elmt)
|
|
|
|
|
|
{
|
|
|
|
|
|
gsize i, j;
|
|
|
|
|
|
char *p_, *pj;
|
|
|
|
|
|
char *bu;
|
|
|
|
|
|
|
|
|
|
|
|
g_assert(dst);
|
|
|
|
|
|
g_assert(elmt_size > 0);
|
|
|
|
|
|
g_assert(n_elmt < G_MAXINT32);
|
|
|
|
|
|
|
|
|
|
|
|
if (n_elmt == 0)
|
|
|
|
|
|
return dst;
|
|
|
|
|
|
|
|
|
|
|
|
if (src && dst != src)
|
|
|
|
|
|
memcpy(dst, src, elmt_size * n_elmt);
|
|
|
|
|
|
|
|
|
|
|
|
if (!rand)
|
|
|
|
|
|
rand = nmtst_get_rand();
|
|
|
|
|
|
|
|
|
|
|
|
bu = g_slice_alloc(elmt_size);
|
|
|
|
|
|
|
|
|
|
|
|
p_ = dst;
|
|
|
|
|
|
for (i = n_elmt; i > 1; i--) {
|
|
|
|
|
|
j = g_rand_int_range(rand, 0, i);
|
|
|
|
|
|
|
|
|
|
|
|
if (j != 0) {
|
|
|
|
|
|
pj = &p_[j * elmt_size];
|
|
|
|
|
|
|
|
|
|
|
|
/* swap */
|
|
|
|
|
|
memcpy(bu, p_, elmt_size);
|
|
|
|
|
|
memcpy(p_, pj, elmt_size);
|
|
|
|
|
|
memcpy(pj, bu, elmt_size);
|
|
|
|
|
|
}
|
|
|
|
|
|
p_ += elmt_size;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
g_slice_free1(elmt_size, bu);
|
|
|
|
|
|
return dst;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2017-02-23 15:24:18 +01:00
|
|
|
|
static inline GSList *
|
2017-01-20 20:50:48 +01:00
|
|
|
|
nmtst_rand_perm_gslist(GRand *rand, GSList *list)
|
|
|
|
|
|
{
|
|
|
|
|
|
GSList *result;
|
|
|
|
|
|
guint l;
|
|
|
|
|
|
|
|
|
|
|
|
if (!rand)
|
|
|
|
|
|
rand = nmtst_get_rand();
|
|
|
|
|
|
|
|
|
|
|
|
/* no need for an efficient implementation :) */
|
|
|
|
|
|
|
|
|
|
|
|
result = 0;
|
|
|
|
|
|
for (l = g_slist_length(list); l > 0; l--) {
|
|
|
|
|
|
GSList *tmp;
|
|
|
|
|
|
|
|
|
|
|
|
tmp = g_slist_nth(list, g_rand_int(rand) % l);
|
|
|
|
|
|
g_assert(tmp);
|
|
|
|
|
|
|
|
|
|
|
|
list = g_slist_remove_link(list, tmp);
|
|
|
|
|
|
result = g_slist_concat(tmp, result);
|
|
|
|
|
|
}
|
|
|
|
|
|
g_assert(!list);
|
|
|
|
|
|
return result;
|
|
|
|
|
|
}
|
2020-03-27 16:08:48 +01:00
|
|
|
|
|
2020-07-22 16:43:20 +02:00
|
|
|
|
static inline void
|
|
|
|
|
|
nmtst_stable_rand(guint64 seed, gpointer buf, gsize len)
|
|
|
|
|
|
{
|
|
|
|
|
|
const guint64 C = 1442695040888963407llu;
|
|
|
|
|
|
const guint64 A = 6364136223846793005llu;
|
|
|
|
|
|
guint8 * b;
|
|
|
|
|
|
union {
|
|
|
|
|
|
guint8 a[sizeof(guint64)];
|
|
|
|
|
|
guint64 n;
|
|
|
|
|
|
} n;
|
2020-09-28 16:03:33 +02:00
|
|
|
|
|
2020-07-22 16:43:20 +02:00
|
|
|
|
/* We want a stable random generator that is in our control and does not
|
|
|
|
|
|
* depend on glibc/glib versions.
|
|
|
|
|
|
* Use a linear congruential generator (x[n+1] = (A * x[n] + C) % M)
|
|
|
|
|
|
* https://en.wikipedia.org/wiki/Linear_congruential_generator
|
|
|
|
|
|
*
|
|
|
|
|
|
* We choose (Knuth’s LCG MMIX)
|
|
|
|
|
|
* A = 6364136223846793005llu
|
|
|
|
|
|
* C = 1442695040888963407llu
|
|
|
|
|
|
* M = 2^64
|
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
|
|
g_assert(len == 0 || buf);
|
|
|
|
|
|
|
|
|
|
|
|
n.n = seed;
|
|
|
|
|
|
b = buf;
|
|
|
|
|
|
for (; len > 0; len--, b++) {
|
|
|
|
|
|
n.n = (A * n.n + C);
|
|
|
|
|
|
|
|
|
|
|
|
/* let's combine the 64 bits randomness in one byte. By xor-ing, it's
|
|
|
|
|
|
* also independent of endianness. */
|
|
|
|
|
|
b[0] = n.a[0] ^ n.a[1] ^ n.a[2] ^ n.a[3] ^ n.a[4] ^ n.a[5] ^ n.a[6] ^ n.a[7];
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2020-03-27 16:08:48 +01:00
|
|
|
|
/*****************************************************************************/
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
|
* nmtst_get_rand_word_length:
|
|
|
|
|
|
* @rand: (allow-none): #GRand instance or %NULL to use the singleton.
|
|
|
|
|
|
*
|
|
|
|
|
|
* Returns: a random integer >= 0, that most frequently is somewhere between
|
|
|
|
|
|
* 0 and 16, but (with decreasing) probability, it can be larger. This can
|
|
|
|
|
|
* be used when we generate random input for unit tests.
|
|
|
|
|
|
*/
|
|
|
|
|
|
static inline guint
|
|
|
|
|
|
nmtst_get_rand_word_length(GRand *rand)
|
|
|
|
|
|
{
|
|
|
|
|
|
guint n;
|
|
|
|
|
|
|
|
|
|
|
|
if (!rand)
|
|
|
|
|
|
rand = nmtst_get_rand();
|
|
|
|
|
|
|
|
|
|
|
|
n = 0;
|
|
|
|
|
|
while (TRUE) {
|
|
|
|
|
|
guint32 rnd = g_rand_int(rand);
|
|
|
|
|
|
guint probability;
|
|
|
|
|
|
|
|
|
|
|
|
/* The following python code implements a random sample with this
|
|
|
|
|
|
* distribution:
|
|
|
|
|
|
*
|
|
|
|
|
|
* def random_histogram(n_tries, scale = None):
|
|
|
|
|
|
* def probability(n_tok):
|
|
|
|
|
|
* import math
|
|
|
|
|
|
* return max(2, math.floor(100 / (2*(n_tok+1))))
|
|
|
|
|
|
* def n_tokens():
|
|
|
|
|
|
* import random
|
|
|
|
|
|
* n_tok = 0
|
|
|
|
|
|
* while True:
|
|
|
|
|
|
* if random.randint(0, 0xFFFFFFFF) % probability(n_tok) == 0:
|
|
|
|
|
|
* return n_tok
|
|
|
|
|
|
* n_tok += 1
|
|
|
|
|
|
* hist = []
|
|
|
|
|
|
* i = 0;
|
|
|
|
|
|
* while i < n_tries:
|
|
|
|
|
|
* n_tok = n_tokens()
|
|
|
|
|
|
* while n_tok >= len(hist):
|
|
|
|
|
|
* hist.append(0)
|
|
|
|
|
|
* hist[n_tok] = hist[n_tok] + 1
|
|
|
|
|
|
* i += 1
|
|
|
|
|
|
* if scale is not None:
|
|
|
|
|
|
* hist = list([round(x / n_tries * scale) for x in hist])
|
|
|
|
|
|
* return hist
|
|
|
|
|
|
*
|
|
|
|
|
|
* For example, random_histogram(n_tries = 1000000, scale = 1000) may give
|
|
|
|
|
|
*
|
|
|
|
|
|
* IDX: [ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29]
|
|
|
|
|
|
* SEEN: [20, 39, 59, 73, 80, 91, 92, 90, 91, 73, 73, 54, 55, 36, 24, 16, 16, 8, 4, 2, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0]
|
|
|
|
|
|
*
|
|
|
|
|
|
* which give a sense of the probability with this individual results are returned.
|
|
|
|
|
|
*/
|
|
|
|
|
|
probability = NM_MAX(2u, (100u / (2u * (n + 1u))));
|
|
|
|
|
|
if ((rnd % probability) == 0)
|
|
|
|
|
|
return n;
|
|
|
|
|
|
n++;
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
2017-01-20 20:50:48 +01:00
|
|
|
|
|
2015-12-21 14:16:35 +01:00
|
|
|
|
/*****************************************************************************/
|
|
|
|
|
|
|
2020-01-03 13:41:14 +01:00
|
|
|
|
static inline gboolean
|
|
|
|
|
|
nmtst_g_source_assert_not_called(gpointer user_data)
|
|
|
|
|
|
{
|
|
|
|
|
|
g_assert_not_reached();
|
|
|
|
|
|
return G_SOURCE_CONTINUE;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2020-11-02 12:55:06 +01:00
|
|
|
|
static inline gboolean
|
|
|
|
|
|
nmtst_g_source_nop(gpointer user_data)
|
|
|
|
|
|
{
|
|
|
|
|
|
g_assert(!user_data);
|
|
|
|
|
|
return G_SOURCE_CONTINUE;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2020-01-03 13:41:14 +01:00
|
|
|
|
static inline gboolean
|
|
|
|
|
|
nmtst_g_source_set_boolean_true(gpointer user_data)
|
|
|
|
|
|
{
|
|
|
|
|
|
gboolean *ptr = user_data;
|
|
|
|
|
|
|
|
|
|
|
|
g_assert(ptr);
|
|
|
|
|
|
g_assert(!*ptr);
|
|
|
|
|
|
*ptr = TRUE;
|
|
|
|
|
|
return G_SOURCE_CONTINUE;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*****************************************************************************/
|
|
|
|
|
|
|
2017-02-23 15:24:18 +01:00
|
|
|
|
static inline gboolean
|
2015-12-21 14:16:35 +01:00
|
|
|
|
_nmtst_main_loop_run_timeout(gpointer user_data)
|
|
|
|
|
|
{
|
|
|
|
|
|
GMainLoop **p_loop = user_data;
|
|
|
|
|
|
|
2018-05-07 16:25:33 +02:00
|
|
|
|
g_assert(p_loop && *p_loop);
|
|
|
|
|
|
g_main_loop_quit(g_steal_pointer(p_loop));
|
2015-12-21 14:16:35 +01:00
|
|
|
|
return G_SOURCE_REMOVE;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2017-02-23 15:24:18 +01:00
|
|
|
|
static inline gboolean
|
2019-12-13 16:54:30 +01:00
|
|
|
|
nmtst_main_loop_run(GMainLoop *loop, guint timeout_msec)
|
2015-12-21 14:16:35 +01:00
|
|
|
|
{
|
2018-05-07 16:25:33 +02:00
|
|
|
|
nm_auto_unref_gsource GSource *source = NULL;
|
2015-12-21 14:16:35 +01:00
|
|
|
|
GMainLoop * loopx = loop;
|
|
|
|
|
|
|
2019-12-13 16:54:30 +01:00
|
|
|
|
if (timeout_msec > 0) {
|
|
|
|
|
|
source = g_timeout_source_new(timeout_msec);
|
2015-12-21 14:16:35 +01:00
|
|
|
|
g_source_set_callback(source, _nmtst_main_loop_run_timeout, &loopx, NULL);
|
2018-05-07 16:25:33 +02:00
|
|
|
|
g_source_attach(source, g_main_loop_get_context(loop));
|
2015-12-21 14:16:35 +01:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
g_main_loop_run(loop);
|
|
|
|
|
|
|
2018-05-07 16:25:33 +02:00
|
|
|
|
if (source)
|
2018-03-30 12:04:12 +02:00
|
|
|
|
g_source_destroy(source);
|
|
|
|
|
|
|
2015-12-21 14:16:35 +01:00
|
|
|
|
/* if the timeout was reached, return FALSE. */
|
|
|
|
|
|
return loopx != NULL;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2017-02-23 15:24:18 +01:00
|
|
|
|
static inline void
|
2016-03-10 16:46:30 +01:00
|
|
|
|
_nmtst_main_loop_quit_on_notify(GObject *object, GParamSpec *pspec, gpointer user_data)
|
|
|
|
|
|
{
|
|
|
|
|
|
GMainLoop *loop = user_data;
|
|
|
|
|
|
|
|
|
|
|
|
g_assert(G_IS_OBJECT(object));
|
|
|
|
|
|
g_assert(loop);
|
|
|
|
|
|
|
|
|
|
|
|
g_main_loop_quit(loop);
|
|
|
|
|
|
}
|
|
|
|
|
|
#define nmtst_main_loop_quit_on_notify ((GCallback) _nmtst_main_loop_quit_on_notify)
|
|
|
|
|
|
|
2020-01-04 08:40:19 +01:00
|
|
|
|
#define nmtst_main_context_iterate_until(context, timeout_msec, condition) \
|
|
|
|
|
|
({ \
|
2019-11-02 15:25:30 +01:00
|
|
|
|
nm_auto_destroy_and_unref_gsource GSource *_source = NULL; \
|
|
|
|
|
|
GMainContext * _context = (context); \
|
|
|
|
|
|
gboolean _had_timeout = FALSE; \
|
2020-10-21 12:51:48 +02:00
|
|
|
|
typeof(timeout_msec) _timeout_msec0 = (timeout_msec); \
|
|
|
|
|
|
gint64 _timeout_msec = _timeout_msec0; \
|
2019-11-02 15:25:30 +01:00
|
|
|
|
\
|
2020-10-21 12:51:48 +02:00
|
|
|
|
g_assert_cmpint(_timeout_msec0, ==, _timeout_msec); \
|
|
|
|
|
|
\
|
|
|
|
|
|
_source = g_timeout_source_new(NM_CLAMP(_timeout_msec, 0, (gint64) G_MAXUINT)); \
|
2020-01-04 08:40:19 +01:00
|
|
|
|
g_source_set_callback(_source, nmtst_g_source_set_boolean_true, &_had_timeout, NULL); \
|
2019-11-02 15:25:30 +01:00
|
|
|
|
g_source_attach(_source, _context); \
|
|
|
|
|
|
\
|
|
|
|
|
|
while (TRUE) { \
|
|
|
|
|
|
if (condition) \
|
|
|
|
|
|
break; \
|
|
|
|
|
|
g_main_context_iteration(_context, TRUE); \
|
2020-01-04 08:40:19 +01:00
|
|
|
|
if (_had_timeout) \
|
|
|
|
|
|
break; \
|
2019-11-02 15:25:30 +01:00
|
|
|
|
} \
|
2020-01-04 08:40:19 +01:00
|
|
|
|
\
|
|
|
|
|
|
!_had_timeout; \
|
|
|
|
|
|
})
|
|
|
|
|
|
|
|
|
|
|
|
#define nmtst_main_context_iterate_until_assert(context, timeout_msec, condition) \
|
|
|
|
|
|
G_STMT_START \
|
|
|
|
|
|
{ \
|
|
|
|
|
|
if (!nmtst_main_context_iterate_until(context, timeout_msec, condition)) \
|
|
|
|
|
|
g_assert(FALSE &&#condition); \
|
2019-11-02 15:25:30 +01:00
|
|
|
|
} \
|
|
|
|
|
|
G_STMT_END
|
|
|
|
|
|
|
2015-12-21 14:16:35 +01:00
|
|
|
|
/*****************************************************************************/
|
|
|
|
|
|
|
2020-01-03 13:41:14 +01:00
|
|
|
|
static inline void
|
|
|
|
|
|
nmtst_main_context_assert_no_dispatch(GMainContext *context, guint timeout_msec)
|
|
|
|
|
|
{
|
|
|
|
|
|
nm_auto_destroy_and_unref_gsource GSource *source = NULL;
|
|
|
|
|
|
gboolean timeout_hit = FALSE;
|
|
|
|
|
|
|
|
|
|
|
|
source = g_timeout_source_new(timeout_msec);
|
|
|
|
|
|
g_source_set_callback(source, nmtst_g_source_set_boolean_true, &timeout_hit, NULL);
|
|
|
|
|
|
g_source_attach(source, context);
|
|
|
|
|
|
|
|
|
|
|
|
while (g_main_context_iteration(context, TRUE)) {
|
|
|
|
|
|
if (timeout_hit)
|
|
|
|
|
|
return;
|
|
|
|
|
|
g_assert_not_reached();
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*****************************************************************************/
|
|
|
|
|
|
|
2020-01-03 13:09:03 +01:00
|
|
|
|
typedef struct {
|
|
|
|
|
|
GMainLoop *_main_loop;
|
|
|
|
|
|
union {
|
|
|
|
|
|
GSList * _list;
|
|
|
|
|
|
const void *const is_waiting;
|
|
|
|
|
|
};
|
|
|
|
|
|
} NMTstContextBusyWatcherData;
|
|
|
|
|
|
|
|
|
|
|
|
static inline void
|
|
|
|
|
|
_nmtst_context_busy_watcher_add_cb(gpointer data, GObject *where_the_object_was)
|
|
|
|
|
|
{
|
|
|
|
|
|
NMTstContextBusyWatcherData *watcher_data = data;
|
|
|
|
|
|
GSList * l;
|
|
|
|
|
|
|
|
|
|
|
|
g_assert(watcher_data);
|
|
|
|
|
|
|
|
|
|
|
|
l = g_slist_find(watcher_data->_list, where_the_object_was);
|
|
|
|
|
|
g_assert(l);
|
|
|
|
|
|
|
|
|
|
|
|
watcher_data->_list = g_slist_delete_link(watcher_data->_list, l);
|
|
|
|
|
|
if (!watcher_data->_list)
|
|
|
|
|
|
g_main_loop_quit(watcher_data->_main_loop);
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static inline void
|
|
|
|
|
|
nmtst_context_busy_watcher_add(NMTstContextBusyWatcherData *watcher_data, GObject *object)
|
|
|
|
|
|
{
|
|
|
|
|
|
g_assert(watcher_data);
|
|
|
|
|
|
g_assert(G_IS_OBJECT(object));
|
|
|
|
|
|
|
|
|
|
|
|
if (!watcher_data->_main_loop) {
|
|
|
|
|
|
watcher_data->_main_loop = g_main_loop_new(g_main_context_get_thread_default(), FALSE);
|
|
|
|
|
|
g_assert(!watcher_data->_list);
|
|
|
|
|
|
} else {
|
|
|
|
|
|
g_assert(g_main_loop_get_context(watcher_data->_main_loop)
|
|
|
|
|
|
== (g_main_context_get_thread_default() ?: g_main_context_default()));
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
g_object_weak_ref(object, _nmtst_context_busy_watcher_add_cb, watcher_data);
|
|
|
|
|
|
watcher_data->_list = g_slist_prepend(watcher_data->_list, object);
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static inline void
|
|
|
|
|
|
nmtst_context_busy_watcher_wait(NMTstContextBusyWatcherData *watcher_data)
|
|
|
|
|
|
{
|
|
|
|
|
|
g_assert(watcher_data);
|
|
|
|
|
|
|
|
|
|
|
|
if (!watcher_data->_main_loop) {
|
|
|
|
|
|
g_assert(!watcher_data->_list);
|
|
|
|
|
|
return;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if (watcher_data->_list) {
|
|
|
|
|
|
if (!nmtst_main_loop_run(watcher_data->_main_loop, 5000))
|
|
|
|
|
|
g_error("timeout running mainloop waiting for GObject to destruct");
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
g_assert(!watcher_data->_list);
|
|
|
|
|
|
nm_clear_pointer(&watcher_data->_main_loop, g_main_loop_unref);
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*****************************************************************************/
|
|
|
|
|
|
|
2017-02-23 15:24:18 +01:00
|
|
|
|
static inline const char *
|
2014-04-23 16:54:54 +02:00
|
|
|
|
nmtst_get_sudo_cmd(void)
|
|
|
|
|
|
{
|
|
|
|
|
|
g_assert(nmtst_initialized());
|
|
|
|
|
|
return __nmtst_internal.sudo_cmd;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2017-02-23 15:24:18 +01:00
|
|
|
|
static inline void
|
2014-04-23 16:54:54 +02:00
|
|
|
|
nmtst_reexec_sudo(void)
|
|
|
|
|
|
{
|
|
|
|
|
|
char * str;
|
|
|
|
|
|
char **argv;
|
|
|
|
|
|
int i;
|
|
|
|
|
|
int errsv;
|
|
|
|
|
|
|
|
|
|
|
|
g_assert(nmtst_initialized());
|
|
|
|
|
|
g_assert(__nmtst_internal.orig_argv);
|
|
|
|
|
|
|
|
|
|
|
|
if (!__nmtst_internal.sudo_cmd)
|
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
|
|
str = g_strjoinv(" ", __nmtst_internal.orig_argv);
|
2014-04-24 21:01:58 +02:00
|
|
|
|
__NMTST_LOG(g_message, ">> exec %s %s", __nmtst_internal.sudo_cmd, str);
|
2014-04-23 16:54:54 +02:00
|
|
|
|
|
|
|
|
|
|
argv = g_new0(char *, 1 + g_strv_length(__nmtst_internal.orig_argv) + 1);
|
|
|
|
|
|
argv[0] = __nmtst_internal.sudo_cmd;
|
|
|
|
|
|
for (i = 0; __nmtst_internal.orig_argv[i]; i++)
|
|
|
|
|
|
argv[i + 1] = __nmtst_internal.orig_argv[i];
|
|
|
|
|
|
|
|
|
|
|
|
execvp(__nmtst_internal.sudo_cmd, argv);
|
|
|
|
|
|
|
|
|
|
|
|
errsv = errno;
|
2019-01-31 17:22:18 +01:00
|
|
|
|
g_error(">> exec %s failed: %d - %s",
|
|
|
|
|
|
__nmtst_internal.sudo_cmd,
|
|
|
|
|
|
errsv,
|
|
|
|
|
|
nm_strerror_native(errsv));
|
2014-04-23 16:54:54 +02:00
|
|
|
|
}
|
2014-04-17 16:27:43 +02:00
|
|
|
|
|
2015-12-22 11:53:45 +01:00
|
|
|
|
/*****************************************************************************/
|
|
|
|
|
|
|
2017-02-23 15:24:18 +01:00
|
|
|
|
static inline gsize
|
2015-12-22 11:53:45 +01:00
|
|
|
|
nmtst_find_all_indexes(gpointer *elements,
|
|
|
|
|
|
gsize n_elements,
|
|
|
|
|
|
gpointer *needles,
|
|
|
|
|
|
gsize n_needles,
|
|
|
|
|
|
gboolean (*equal_fcn)(gpointer element, gpointer needle, gpointer user_data),
|
|
|
|
|
|
gpointer user_data,
|
|
|
|
|
|
gssize * out_idx)
|
|
|
|
|
|
{
|
|
|
|
|
|
gsize i, j, k;
|
|
|
|
|
|
gsize found = 0;
|
2020-09-28 16:03:33 +02:00
|
|
|
|
|
2015-12-22 11:53:45 +01:00
|
|
|
|
for (i = 0; i < n_needles; i++) {
|
|
|
|
|
|
gssize idx = -1;
|
2020-09-28 16:03:33 +02:00
|
|
|
|
|
2015-12-22 11:53:45 +01:00
|
|
|
|
for (j = 0; j < n_elements; j++) {
|
|
|
|
|
|
/* no duplicates */
|
|
|
|
|
|
for (k = 0; k < i; k++) {
|
|
|
|
|
|
if (out_idx[k] == j)
|
|
|
|
|
|
goto next;
|
|
|
|
|
|
}
|
2020-09-28 16:03:33 +02:00
|
|
|
|
|
2015-12-22 11:53:45 +01:00
|
|
|
|
if (equal_fcn(elements[j], needles[i], user_data)) {
|
|
|
|
|
|
idx = j;
|
|
|
|
|
|
break;
|
|
|
|
|
|
}
|
|
|
|
|
|
next:;
|
|
|
|
|
|
}
|
2020-09-28 16:03:33 +02:00
|
|
|
|
|
2015-12-22 11:53:45 +01:00
|
|
|
|
out_idx[i] = idx;
|
|
|
|
|
|
if (idx >= 0)
|
|
|
|
|
|
found++;
|
|
|
|
|
|
}
|
2020-09-28 16:03:33 +02:00
|
|
|
|
|
2015-12-22 11:53:45 +01:00
|
|
|
|
return found;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*****************************************************************************/
|
|
|
|
|
|
|
2014-04-17 16:27:43 +02:00
|
|
|
|
#define __define_nmtst_static(NUM, SIZE) \
|
|
|
|
|
|
static inline const char *nmtst_static_##SIZE##_##NUM(const char *str) \
|
|
|
|
|
|
{ \
|
|
|
|
|
|
gsize l; \
|
2020-09-18 12:22:47 +02:00
|
|
|
|
static _nm_thread_local char buf[SIZE]; \
|
2014-04-17 16:27:43 +02:00
|
|
|
|
\
|
|
|
|
|
|
if (!str) \
|
|
|
|
|
|
return NULL; \
|
|
|
|
|
|
l = g_strlcpy(buf, str, sizeof(buf)); \
|
|
|
|
|
|
g_assert(l < sizeof(buf)); \
|
|
|
|
|
|
return buf; \
|
|
|
|
|
|
}
|
|
|
|
|
|
__define_nmtst_static(01, 1024) __define_nmtst_static(02, 1024) __define_nmtst_static(03, 1024)
|
|
|
|
|
|
#undef __define_nmtst_static
|
|
|
|
|
|
|
2018-10-12 18:05:48 +02:00
|
|
|
|
#if defined(__NM_UTILS_H__) || defined(NM_UTILS_H)
|
|
|
|
|
|
|
2016-10-05 14:38:01 +02:00
|
|
|
|
#define NMTST_UUID_INIT(uuid) \
|
|
|
|
|
|
gs_free char * _nmtst_hidden_##uuid = nm_utils_uuid_generate(); \
|
|
|
|
|
|
const char *const uuid = _nmtst_hidden_##uuid
|
|
|
|
|
|
|
2017-02-23 15:24:18 +01:00
|
|
|
|
static inline const char *nmtst_uuid_generate(void)
|
2015-12-23 14:02:44 +01:00
|
|
|
|
{
|
2020-09-18 12:22:47 +02:00
|
|
|
|
static _nm_thread_local char u[37];
|
2015-12-23 14:02:44 +01:00
|
|
|
|
gs_free char * m = NULL;
|
|
|
|
|
|
|
|
|
|
|
|
m = nm_utils_uuid_generate();
|
|
|
|
|
|
g_assert(m && strlen(m) == sizeof(u) - 1);
|
|
|
|
|
|
memcpy(u, m, sizeof(u));
|
|
|
|
|
|
return u;
|
|
|
|
|
|
}
|
2014-04-17 16:27:43 +02:00
|
|
|
|
|
2018-10-12 18:05:48 +02:00
|
|
|
|
#endif
|
|
|
|
|
|
|
2014-04-14 12:03:19 +02:00
|
|
|
|
#define nmtst_assert_str_has_substr(str, substr) \
|
|
|
|
|
|
G_STMT_START \
|
|
|
|
|
|
{ \
|
|
|
|
|
|
const char *__str = (str); \
|
|
|
|
|
|
const char *__substr = (substr); \
|
|
|
|
|
|
\
|
|
|
|
|
|
g_assert(__str); \
|
|
|
|
|
|
g_assert(__substr); \
|
|
|
|
|
|
if (strstr(__str, __substr) == NULL) \
|
|
|
|
|
|
g_error("%s:%d: Expects \"%s\" but got \"%s\"", __FILE__, __LINE__, __substr, __str); \
|
|
|
|
|
|
} \
|
|
|
|
|
|
G_STMT_END
|
|
|
|
|
|
|
2020-09-18 12:25:00 +02:00
|
|
|
|
static inline in_addr_t
|
2014-03-14 17:49:49 +01:00
|
|
|
|
nmtst_inet4_from_string(const char *str)
|
|
|
|
|
|
{
|
2020-09-18 12:25:00 +02:00
|
|
|
|
in_addr_t addr;
|
2014-03-14 17:49:49 +01:00
|
|
|
|
int success;
|
|
|
|
|
|
|
|
|
|
|
|
if (!str)
|
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
|
|
|
|
success = inet_pton(AF_INET, str, &addr);
|
|
|
|
|
|
|
|
|
|
|
|
g_assert(success == 1);
|
|
|
|
|
|
|
|
|
|
|
|
return addr;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2017-02-23 15:24:18 +01:00
|
|
|
|
static inline const struct in6_addr *
|
2014-03-14 17:49:49 +01:00
|
|
|
|
nmtst_inet6_from_string(const char *str)
|
|
|
|
|
|
{
|
2020-09-18 12:22:47 +02:00
|
|
|
|
static _nm_thread_local struct in6_addr addr;
|
2014-03-14 17:49:49 +01:00
|
|
|
|
int success;
|
|
|
|
|
|
|
|
|
|
|
|
if (!str)
|
|
|
|
|
|
addr = in6addr_any;
|
|
|
|
|
|
else {
|
|
|
|
|
|
success = inet_pton(AF_INET6, str, &addr);
|
|
|
|
|
|
g_assert(success == 1);
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
return &addr;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2018-11-27 10:20:25 +01:00
|
|
|
|
static inline gconstpointer
|
|
|
|
|
|
nmtst_inet_from_string(int addr_family, const char *str)
|
|
|
|
|
|
{
|
|
|
|
|
|
if (addr_family == AF_INET) {
|
|
|
|
|
|
static in_addr_t a;
|
|
|
|
|
|
|
|
|
|
|
|
a = nmtst_inet4_from_string(str);
|
|
|
|
|
|
return &a;
|
|
|
|
|
|
}
|
|
|
|
|
|
if (addr_family == AF_INET6)
|
|
|
|
|
|
return nmtst_inet6_from_string(str);
|
|
|
|
|
|
|
|
|
|
|
|
g_assert_not_reached();
|
|
|
|
|
|
return NULL;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static inline const char *
|
|
|
|
|
|
nmtst_inet_to_string(int addr_family, gconstpointer addr)
|
|
|
|
|
|
{
|
2020-09-18 12:22:47 +02:00
|
|
|
|
static _nm_thread_local char buf[NM_CONST_MAX(INET6_ADDRSTRLEN, INET_ADDRSTRLEN)];
|
2018-11-27 10:20:25 +01:00
|
|
|
|
|
|
|
|
|
|
g_assert(NM_IN_SET(addr_family, AF_INET, AF_INET6));
|
|
|
|
|
|
g_assert(addr);
|
|
|
|
|
|
|
|
|
|
|
|
if (inet_ntop(addr_family, addr, buf, sizeof(buf)) != buf)
|
|
|
|
|
|
g_assert_not_reached();
|
|
|
|
|
|
|
|
|
|
|
|
return buf;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static inline const char *
|
|
|
|
|
|
nmtst_inet4_to_string(in_addr_t addr)
|
|
|
|
|
|
{
|
|
|
|
|
|
return nmtst_inet_to_string(AF_INET, &addr);
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static inline const char *
|
|
|
|
|
|
nmtst_inet6_to_string(const struct in6_addr *addr)
|
|
|
|
|
|
{
|
|
|
|
|
|
return nmtst_inet_to_string(AF_INET6, addr);
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2017-02-23 15:24:18 +01:00
|
|
|
|
static inline void
|
2015-10-16 15:45:48 +02:00
|
|
|
|
_nmtst_assert_ip4_address(const char *file, int line, in_addr_t addr, const char *str_expected)
|
|
|
|
|
|
{
|
|
|
|
|
|
if (nmtst_inet4_from_string(str_expected) != addr) {
|
|
|
|
|
|
char buf[100];
|
|
|
|
|
|
|
|
|
|
|
|
g_error("%s:%d: Unexpected IPv4 address: expected %s, got %s",
|
2018-04-24 11:20:03 +02:00
|
|
|
|
file,
|
|
|
|
|
|
line,
|
|
|
|
|
|
str_expected ?: "0.0.0.0",
|
2015-10-16 15:45:48 +02:00
|
|
|
|
inet_ntop(AF_INET, &addr, buf, sizeof(buf)));
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
#define nmtst_assert_ip4_address(addr, str_expected) \
|
|
|
|
|
|
_nmtst_assert_ip4_address(__FILE__, __LINE__, addr, str_expected)
|
|
|
|
|
|
|
2017-02-23 15:24:18 +01:00
|
|
|
|
static inline void
|
2015-10-16 15:45:48 +02:00
|
|
|
|
_nmtst_assert_ip6_address(const char * file,
|
|
|
|
|
|
int line,
|
|
|
|
|
|
const struct in6_addr *addr,
|
|
|
|
|
|
const char * str_expected)
|
|
|
|
|
|
{
|
|
|
|
|
|
struct in6_addr any = in6addr_any;
|
2020-09-28 16:03:33 +02:00
|
|
|
|
|
2015-10-16 15:45:48 +02:00
|
|
|
|
if (!addr)
|
|
|
|
|
|
addr = &any;
|
2020-09-28 16:03:33 +02:00
|
|
|
|
|
2015-10-16 15:45:48 +02:00
|
|
|
|
if (memcmp(nmtst_inet6_from_string(str_expected), addr, sizeof(*addr)) != 0) {
|
|
|
|
|
|
char buf[100];
|
2020-09-28 16:03:33 +02:00
|
|
|
|
|
2015-10-16 15:45:48 +02:00
|
|
|
|
g_error("%s:%d: Unexpected IPv6 address: expected %s, got %s",
|
2018-04-24 11:20:03 +02:00
|
|
|
|
file,
|
|
|
|
|
|
line,
|
|
|
|
|
|
str_expected ?: "::",
|
2015-11-02 18:18:12 +01:00
|
|
|
|
inet_ntop(AF_INET6, addr, buf, sizeof(buf)));
|
2015-10-16 15:45:48 +02:00
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
#define nmtst_assert_ip6_address(addr, str_expected) \
|
|
|
|
|
|
_nmtst_assert_ip6_address(__FILE__, __LINE__, addr, str_expected)
|
2020-09-28 16:03:33 +02:00
|
|
|
|
|
2020-07-31 15:05:31 +02:00
|
|
|
|
#define nmtst_assert_ip_address(addr_family, addr, str_expected) \
|
|
|
|
|
|
G_STMT_START \
|
|
|
|
|
|
{ \
|
|
|
|
|
|
if (NM_IS_IPv4(addr_family)) \
|
|
|
|
|
|
nmtst_assert_ip4_address(*((const in_addr_t *) (addr)), (str_expected)); \
|
|
|
|
|
|
else \
|
|
|
|
|
|
nmtst_assert_ip6_address((const struct in6_addr *) (addr), (str_expected)); \
|
|
|
|
|
|
} \
|
|
|
|
|
|
G_STMT_END
|
|
|
|
|
|
|
2014-06-05 11:31:00 +02:00
|
|
|
|
#define nmtst_spawn_sync(working_directory, standard_out, standard_err, assert_exit_status, ...) \
|
|
|
|
|
|
__nmtst_spawn_sync(working_directory, \
|
|
|
|
|
|
standard_out, \
|
|
|
|
|
|
standard_err, \
|
|
|
|
|
|
assert_exit_status, \
|
|
|
|
|
|
##__VA_ARGS__, \
|
|
|
|
|
|
NULL)
|
|
|
|
|
|
static inline int __nmtst_spawn_sync(const char *working_directory,
|
|
|
|
|
|
char ** standard_out,
|
|
|
|
|
|
char ** standard_err,
|
|
|
|
|
|
int assert_exit_status,
|
|
|
|
|
|
...) G_GNUC_NULL_TERMINATED;
|
all: don't use gchar/gshort/gint/glong but C types
We commonly don't use the glib typedefs for char/short/int/long,
but their C types directly.
$ git grep '\<g\(char\|short\|int\|long\|float\|double\)\>' | wc -l
587
$ git grep '\<\(char\|short\|int\|long\|float\|double\)\>' | wc -l
21114
One could argue that using the glib typedefs is preferable in
public API (of our glib based libnm library) or where it clearly
is related to glib, like during
g_object_set (obj, PROPERTY, (gint) value, NULL);
However, that argument does not seem strong, because in practice we don't
follow that argument today, and seldomly use the glib typedefs.
Also, the style guide for this would be hard to formalize, because
"using them where clearly related to a glib" is a very loose suggestion.
Also note that glib typedefs will always just be typedefs of the
underlying C types. There is no danger of glib changing the meaning
of these typedefs (because that would be a major API break of glib).
A simple style guide is instead: don't use these typedefs.
No manual actions, I only ran the bash script:
FILES=($(git ls-files '*.[hc]'))
sed -i \
-e 's/\<g\(char\|short\|int\|long\|float\|double\)\>\( [^ ]\)/\1\2/g' \
-e 's/\<g\(char\|short\|int\|long\|float\|double\)\> /\1 /g' \
-e 's/\<g\(char\|short\|int\|long\|float\|double\)\>/\1/g' \
"${FILES[@]}"
2018-07-11 07:40:19 +02:00
|
|
|
|
static inline int
|
2014-06-05 11:31:00 +02:00
|
|
|
|
__nmtst_spawn_sync(const char *working_directory,
|
|
|
|
|
|
char ** standard_out,
|
|
|
|
|
|
char ** standard_err,
|
|
|
|
|
|
int assert_exit_status,
|
|
|
|
|
|
...)
|
|
|
|
|
|
{
|
all: don't use gchar/gshort/gint/glong but C types
We commonly don't use the glib typedefs for char/short/int/long,
but their C types directly.
$ git grep '\<g\(char\|short\|int\|long\|float\|double\)\>' | wc -l
587
$ git grep '\<\(char\|short\|int\|long\|float\|double\)\>' | wc -l
21114
One could argue that using the glib typedefs is preferable in
public API (of our glib based libnm library) or where it clearly
is related to glib, like during
g_object_set (obj, PROPERTY, (gint) value, NULL);
However, that argument does not seem strong, because in practice we don't
follow that argument today, and seldomly use the glib typedefs.
Also, the style guide for this would be hard to formalize, because
"using them where clearly related to a glib" is a very loose suggestion.
Also note that glib typedefs will always just be typedefs of the
underlying C types. There is no danger of glib changing the meaning
of these typedefs (because that would be a major API break of glib).
A simple style guide is instead: don't use these typedefs.
No manual actions, I only ran the bash script:
FILES=($(git ls-files '*.[hc]'))
sed -i \
-e 's/\<g\(char\|short\|int\|long\|float\|double\)\>\( [^ ]\)/\1\2/g' \
-e 's/\<g\(char\|short\|int\|long\|float\|double\)\> /\1 /g' \
-e 's/\<g\(char\|short\|int\|long\|float\|double\)\>/\1/g' \
"${FILES[@]}"
2018-07-11 07:40:19 +02:00
|
|
|
|
int exit_status = 0;
|
2014-06-05 11:31:00 +02:00
|
|
|
|
GError * error = NULL;
|
|
|
|
|
|
char * arg;
|
|
|
|
|
|
va_list va_args;
|
|
|
|
|
|
GPtrArray *argv = g_ptr_array_new();
|
|
|
|
|
|
gboolean success;
|
2020-09-28 16:03:33 +02:00
|
|
|
|
|
2014-06-05 11:31:00 +02:00
|
|
|
|
va_start(va_args, assert_exit_status);
|
|
|
|
|
|
while ((arg = va_arg(va_args, char *)))
|
|
|
|
|
|
g_ptr_array_add(argv, arg);
|
|
|
|
|
|
va_end(va_args);
|
2020-09-28 16:03:33 +02:00
|
|
|
|
|
2014-06-05 11:31:00 +02:00
|
|
|
|
g_assert(argv->len >= 1);
|
|
|
|
|
|
g_ptr_array_add(argv, NULL);
|
2020-09-28 16:03:33 +02:00
|
|
|
|
|
2014-06-05 11:31:00 +02:00
|
|
|
|
success = g_spawn_sync(working_directory,
|
|
|
|
|
|
(char **) argv->pdata,
|
|
|
|
|
|
NULL,
|
|
|
|
|
|
0 /*G_SPAWN_DEFAULT*/,
|
|
|
|
|
|
NULL,
|
2020-09-28 16:03:33 +02:00
|
|
|
|
NULL,
|
2014-06-05 11:31:00 +02:00
|
|
|
|
standard_out,
|
|
|
|
|
|
standard_err,
|
|
|
|
|
|
&exit_status,
|
|
|
|
|
|
&error);
|
|
|
|
|
|
if (!success)
|
|
|
|
|
|
g_error("nmtst_spawn_sync(%s): %s", ((char **) argv->pdata)[0], error->message);
|
|
|
|
|
|
g_assert(!error);
|
2020-09-28 16:03:33 +02:00
|
|
|
|
|
2014-06-05 11:31:00 +02:00
|
|
|
|
g_assert(!standard_out || *standard_out);
|
|
|
|
|
|
g_assert(!standard_err || *standard_err);
|
2020-09-28 16:03:33 +02:00
|
|
|
|
|
2014-06-05 11:31:00 +02:00
|
|
|
|
if (assert_exit_status != -1) {
|
|
|
|
|
|
/* exit status is a guint8 on success. Set @assert_exit_status to -1
|
|
|
|
|
|
* not to check for the exit status. */
|
|
|
|
|
|
g_assert(WIFEXITED(exit_status));
|
|
|
|
|
|
g_assert_cmpint(WEXITSTATUS(exit_status), ==, assert_exit_status);
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
g_ptr_array_free(argv, TRUE);
|
|
|
|
|
|
return exit_status;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2016-10-02 18:22:50 +02:00
|
|
|
|
/*****************************************************************************/
|
2014-04-22 16:55:28 +02:00
|
|
|
|
|
2017-02-23 15:24:18 +01:00
|
|
|
|
static inline char *
|
2015-03-10 14:32:16 +01:00
|
|
|
|
nmtst_file_resolve_relative_path(const char *rel, const char *cwd)
|
|
|
|
|
|
{
|
|
|
|
|
|
gs_free char *cwd_free = NULL;
|
|
|
|
|
|
|
|
|
|
|
|
g_assert(rel && *rel);
|
|
|
|
|
|
|
|
|
|
|
|
if (g_path_is_absolute(rel))
|
|
|
|
|
|
return g_strdup(rel);
|
|
|
|
|
|
|
|
|
|
|
|
if (!cwd)
|
|
|
|
|
|
cwd = cwd_free = g_get_current_dir();
|
|
|
|
|
|
return g_build_filename(cwd, rel, NULL);
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2017-02-23 15:24:18 +01:00
|
|
|
|
static inline char *
|
2016-11-01 10:41:04 +01:00
|
|
|
|
nmtst_file_get_contents(const char *filename)
|
|
|
|
|
|
{
|
|
|
|
|
|
GError * error = NULL;
|
|
|
|
|
|
gboolean success;
|
|
|
|
|
|
char * contents = NULL;
|
|
|
|
|
|
gsize len;
|
2020-09-28 16:03:33 +02:00
|
|
|
|
|
2016-11-01 10:41:04 +01:00
|
|
|
|
success = g_file_get_contents(filename, &contents, &len, &error);
|
|
|
|
|
|
nmtst_assert_success(success && contents, error);
|
|
|
|
|
|
g_assert_cmpint(strlen(contents), ==, len);
|
|
|
|
|
|
return contents;
|
|
|
|
|
|
}
|
2020-09-28 16:03:33 +02:00
|
|
|
|
|
2020-01-10 16:34:48 +01:00
|
|
|
|
#define nmtst_file_set_contents_size(filename, content, size) \
|
2017-05-25 14:03:42 +02:00
|
|
|
|
G_STMT_START \
|
|
|
|
|
|
{ \
|
|
|
|
|
|
GError * _error = NULL; \
|
|
|
|
|
|
gboolean _success; \
|
2020-01-10 16:34:48 +01:00
|
|
|
|
const char *_content = (content); \
|
|
|
|
|
|
gssize _size = (size); \
|
|
|
|
|
|
\
|
|
|
|
|
|
g_assert(_content); \
|
|
|
|
|
|
\
|
|
|
|
|
|
if (_size < 0) { \
|
|
|
|
|
|
g_assert(_size == -1); \
|
|
|
|
|
|
_size = strlen(_content); \
|
|
|
|
|
|
} \
|
2017-05-25 14:03:42 +02:00
|
|
|
|
\
|
2020-01-10 16:34:48 +01:00
|
|
|
|
_success = g_file_set_contents((filename), _content, _size, &_error); \
|
2017-05-25 14:03:42 +02:00
|
|
|
|
nmtst_assert_success(_success, _error); \
|
|
|
|
|
|
} \
|
|
|
|
|
|
G_STMT_END
|
|
|
|
|
|
|
2020-01-10 16:34:48 +01:00
|
|
|
|
#define nmtst_file_set_contents(filename, content) \
|
|
|
|
|
|
nmtst_file_set_contents_size(filename, content, -1)
|
|
|
|
|
|
|
2016-11-06 12:19:52 +01:00
|
|
|
|
/*****************************************************************************/
|
|
|
|
|
|
|
2017-02-23 15:24:18 +01:00
|
|
|
|
static inline void
|
2016-11-06 12:19:52 +01:00
|
|
|
|
nmtst_file_unlink_if_exists(const char *name)
|
|
|
|
|
|
{
|
|
|
|
|
|
int errsv;
|
|
|
|
|
|
|
|
|
|
|
|
g_assert(name && name[0]);
|
|
|
|
|
|
|
|
|
|
|
|
if (unlink(name) != 0) {
|
|
|
|
|
|
errsv = errno;
|
|
|
|
|
|
if (errsv != ENOENT)
|
2019-01-31 17:22:18 +01:00
|
|
|
|
g_error("nmtst_file_unlink_if_exists(%s): failed with %s",
|
|
|
|
|
|
name,
|
|
|
|
|
|
nm_strerror_native(errsv));
|
2016-11-06 12:19:52 +01:00
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2017-02-23 15:24:18 +01:00
|
|
|
|
static inline void
|
2016-11-06 12:19:52 +01:00
|
|
|
|
nmtst_file_unlink(const char *name)
|
|
|
|
|
|
{
|
|
|
|
|
|
int errsv;
|
|
|
|
|
|
|
|
|
|
|
|
g_assert(name && name[0]);
|
|
|
|
|
|
|
|
|
|
|
|
if (unlink(name) != 0) {
|
|
|
|
|
|
errsv = errno;
|
2019-01-31 17:22:18 +01:00
|
|
|
|
g_error("nmtst_file_unlink(%s): failed with %s", name, nm_strerror_native(errsv));
|
2016-11-06 12:19:52 +01:00
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2017-02-23 15:24:18 +01:00
|
|
|
|
static inline void
|
2016-11-06 12:19:52 +01:00
|
|
|
|
_nmtst_auto_unlinkfile(char **p_name)
|
|
|
|
|
|
{
|
|
|
|
|
|
if (*p_name) {
|
|
|
|
|
|
nmtst_file_unlink(*p_name);
|
|
|
|
|
|
nm_clear_g_free(p_name);
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
#define nmtst_auto_unlinkfile nm_auto(_nmtst_auto_unlinkfile)
|
|
|
|
|
|
|
|
|
|
|
|
/*****************************************************************************/
|
|
|
|
|
|
|
2017-02-23 15:24:18 +01:00
|
|
|
|
static inline void
|
2015-03-10 14:32:16 +01:00
|
|
|
|
_nmtst_assert_resolve_relative_path_equals(const char *f1,
|
|
|
|
|
|
const char *f2,
|
|
|
|
|
|
const char *file,
|
|
|
|
|
|
int line)
|
|
|
|
|
|
{
|
|
|
|
|
|
gs_free char *p1 = NULL, *p2 = NULL;
|
|
|
|
|
|
|
|
|
|
|
|
p1 = nmtst_file_resolve_relative_path(f1, NULL);
|
|
|
|
|
|
p2 = nmtst_file_resolve_relative_path(f2, NULL);
|
|
|
|
|
|
g_assert(p1 && *p1);
|
|
|
|
|
|
|
|
|
|
|
|
/* Fixme: later we might need to coalesce repeated '/', "./", and "../".
|
|
|
|
|
|
* For now, it's good enough. */
|
|
|
|
|
|
if (g_strcmp0(p1, p2) != 0)
|
|
|
|
|
|
g_error("%s:%d : filenames don't match \"%s\" vs. \"%s\" // \"%s\" - \"%s\"",
|
|
|
|
|
|
file,
|
|
|
|
|
|
line,
|
|
|
|
|
|
f1,
|
|
|
|
|
|
f2,
|
|
|
|
|
|
p1,
|
|
|
|
|
|
p2);
|
|
|
|
|
|
}
|
|
|
|
|
|
#define nmtst_assert_resolve_relative_path_equals(f1, f2) \
|
|
|
|
|
|
_nmtst_assert_resolve_relative_path_equals(f1, f2, __FILE__, __LINE__);
|
|
|
|
|
|
|
2016-10-02 18:22:50 +02:00
|
|
|
|
/*****************************************************************************/
|
2015-03-10 14:32:16 +01:00
|
|
|
|
|
2018-10-24 11:51:57 +02:00
|
|
|
|
#ifdef __NETWORKMANAGER_LOGGING_H__
|
|
|
|
|
|
static inline gpointer
|
|
|
|
|
|
nmtst_logging_disable(gboolean always)
|
|
|
|
|
|
{
|
|
|
|
|
|
gpointer p;
|
|
|
|
|
|
|
|
|
|
|
|
g_assert(nmtst_initialized());
|
|
|
|
|
|
if (!always && __nmtst_internal.no_expect_message) {
|
|
|
|
|
|
/* The caller does not want to @always suppress logging. Instead,
|
|
|
|
|
|
* the caller wants to suppress unexpected log messages that would
|
|
|
|
|
|
* fail assertions (since we possibly assert against all unexpected
|
|
|
|
|
|
* log messages).
|
|
|
|
|
|
*
|
|
|
|
|
|
* If the test is run with no-expect-message, then don't suppress
|
|
|
|
|
|
* the loggings, because they also wouldn't fail assertions. */
|
|
|
|
|
|
return NULL;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
p = g_memdup(_nm_logging_enabled_state, sizeof(_nm_logging_enabled_state));
|
|
|
|
|
|
memset(_nm_logging_enabled_state, 0, sizeof(_nm_logging_enabled_state));
|
|
|
|
|
|
return p;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static inline void
|
|
|
|
|
|
nmtst_logging_reenable(gpointer old_state)
|
|
|
|
|
|
{
|
|
|
|
|
|
g_assert(nmtst_initialized());
|
|
|
|
|
|
if (old_state) {
|
|
|
|
|
|
memcpy(_nm_logging_enabled_state, old_state, sizeof(_nm_logging_enabled_state));
|
|
|
|
|
|
g_free(old_state);
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
|
|
/*****************************************************************************/
|
|
|
|
|
|
|
2016-02-02 14:30:15 +01:00
|
|
|
|
#ifdef NM_SETTING_IP_CONFIG_H
|
2017-02-23 15:24:18 +01:00
|
|
|
|
static inline void
|
2016-02-02 14:30:15 +01:00
|
|
|
|
nmtst_setting_ip_config_add_address(NMSettingIPConfig *s_ip, const char *address, guint prefix)
|
|
|
|
|
|
{
|
|
|
|
|
|
NMIPAddress *addr;
|
|
|
|
|
|
int family;
|
|
|
|
|
|
|
|
|
|
|
|
g_assert(s_ip);
|
|
|
|
|
|
|
2020-01-09 12:17:41 +01:00
|
|
|
|
if (nm_utils_ipaddr_is_valid(AF_INET, address))
|
2016-02-02 14:30:15 +01:00
|
|
|
|
family = AF_INET;
|
2020-01-09 12:17:41 +01:00
|
|
|
|
else if (nm_utils_ipaddr_is_valid(AF_INET6, address))
|
2016-02-02 14:30:15 +01:00
|
|
|
|
family = AF_INET6;
|
|
|
|
|
|
else
|
2016-02-12 09:05:27 +01:00
|
|
|
|
g_assert_not_reached();
|
2016-02-02 14:30:15 +01:00
|
|
|
|
|
|
|
|
|
|
addr = nm_ip_address_new(family, address, prefix, NULL);
|
|
|
|
|
|
g_assert(addr);
|
|
|
|
|
|
g_assert(nm_setting_ip_config_add_address(s_ip, addr));
|
|
|
|
|
|
nm_ip_address_unref(addr);
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2017-02-23 15:24:18 +01:00
|
|
|
|
static inline void
|
2016-02-02 14:30:15 +01:00
|
|
|
|
nmtst_setting_ip_config_add_route(NMSettingIPConfig *s_ip,
|
|
|
|
|
|
const char * dest,
|
|
|
|
|
|
guint prefix,
|
|
|
|
|
|
const char * next_hop,
|
|
|
|
|
|
gint64 metric)
|
|
|
|
|
|
{
|
|
|
|
|
|
NMIPRoute *route;
|
|
|
|
|
|
int family;
|
|
|
|
|
|
|
|
|
|
|
|
g_assert(s_ip);
|
|
|
|
|
|
|
2020-01-09 12:17:41 +01:00
|
|
|
|
if (nm_utils_ipaddr_is_valid(AF_INET, dest))
|
2016-02-02 14:30:15 +01:00
|
|
|
|
family = AF_INET;
|
2020-01-09 12:17:41 +01:00
|
|
|
|
else if (nm_utils_ipaddr_is_valid(AF_INET6, dest))
|
2016-02-02 14:30:15 +01:00
|
|
|
|
family = AF_INET6;
|
|
|
|
|
|
else
|
2016-02-12 09:05:27 +01:00
|
|
|
|
g_assert_not_reached();
|
2016-02-02 14:30:15 +01:00
|
|
|
|
|
|
|
|
|
|
route = nm_ip_route_new(family, dest, prefix, next_hop, metric, NULL);
|
|
|
|
|
|
g_assert(route);
|
|
|
|
|
|
g_assert(nm_setting_ip_config_add_route(s_ip, route));
|
|
|
|
|
|
nm_ip_route_unref(route);
|
|
|
|
|
|
}
|
2017-02-17 09:27:11 +01:00
|
|
|
|
|
2017-03-14 11:20:28 +01:00
|
|
|
|
static inline void
|
2017-02-17 09:27:11 +01:00
|
|
|
|
nmtst_assert_route_attribute_string(NMIPRoute *route, const char *name, const char *value)
|
|
|
|
|
|
{
|
|
|
|
|
|
GVariant *variant;
|
|
|
|
|
|
|
|
|
|
|
|
variant = nm_ip_route_get_attribute(route, name);
|
|
|
|
|
|
g_assert(variant);
|
|
|
|
|
|
g_assert(g_variant_is_of_type(variant, G_VARIANT_TYPE_STRING));
|
|
|
|
|
|
g_assert_cmpstr(g_variant_get_string(variant, NULL), ==, value);
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2017-03-14 11:20:28 +01:00
|
|
|
|
static inline void
|
2017-02-17 09:27:11 +01:00
|
|
|
|
nmtst_assert_route_attribute_byte(NMIPRoute *route, const char *name, guchar value)
|
|
|
|
|
|
{
|
|
|
|
|
|
GVariant *variant;
|
|
|
|
|
|
|
|
|
|
|
|
variant = nm_ip_route_get_attribute(route, name);
|
|
|
|
|
|
g_assert(variant);
|
|
|
|
|
|
g_assert(g_variant_is_of_type(variant, G_VARIANT_TYPE_BYTE));
|
|
|
|
|
|
g_assert_cmpint(g_variant_get_byte(variant), ==, value);
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2017-03-14 11:20:28 +01:00
|
|
|
|
static inline void
|
2017-02-17 09:27:11 +01:00
|
|
|
|
nmtst_assert_route_attribute_uint32(NMIPRoute *route, const char *name, guint32 value)
|
|
|
|
|
|
{
|
|
|
|
|
|
GVariant *variant;
|
|
|
|
|
|
|
|
|
|
|
|
variant = nm_ip_route_get_attribute(route, name);
|
|
|
|
|
|
g_assert(variant);
|
|
|
|
|
|
g_assert(g_variant_is_of_type(variant, G_VARIANT_TYPE_UINT32));
|
|
|
|
|
|
g_assert_cmpint(g_variant_get_uint32(variant), ==, value);
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2017-03-14 11:20:28 +01:00
|
|
|
|
static inline void
|
2017-02-17 09:27:11 +01:00
|
|
|
|
nmtst_assert_route_attribute_boolean(NMIPRoute *route, const char *name, gboolean value)
|
|
|
|
|
|
{
|
|
|
|
|
|
GVariant *variant;
|
|
|
|
|
|
|
|
|
|
|
|
variant = nm_ip_route_get_attribute(route, name);
|
|
|
|
|
|
g_assert(variant);
|
|
|
|
|
|
g_assert(g_variant_is_of_type(variant, G_VARIANT_TYPE_BOOLEAN));
|
|
|
|
|
|
g_assert_cmpint(g_variant_get_boolean(variant), ==, value);
|
|
|
|
|
|
}
|
2016-02-02 14:30:15 +01:00
|
|
|
|
#endif /* NM_SETTING_IP_CONFIG_H */
|
|
|
|
|
|
|
2015-12-22 14:28:14 +01:00
|
|
|
|
#if (defined(__NM_SIMPLE_CONNECTION_H__) && defined(__NM_SETTING_CONNECTION_H__)) \
|
|
|
|
|
|
|| (defined(NM_CONNECTION_H))
|
2014-07-08 19:23:11 +02:00
|
|
|
|
|
2017-02-23 15:24:18 +01:00
|
|
|
|
static inline NMConnection *
|
2016-02-15 00:37:22 +01:00
|
|
|
|
nmtst_clone_connection(NMConnection *connection)
|
|
|
|
|
|
{
|
|
|
|
|
|
g_assert(NM_IS_CONNECTION(connection));
|
|
|
|
|
|
|
|
|
|
|
|
#if defined(__NM_SIMPLE_CONNECTION_H__)
|
|
|
|
|
|
return nm_simple_connection_new_clone(connection);
|
|
|
|
|
|
#else
|
|
|
|
|
|
return nm_connection_duplicate(connection);
|
|
|
|
|
|
#endif
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2017-02-23 15:24:18 +01:00
|
|
|
|
static inline NMConnection *
|
2014-07-08 19:23:11 +02:00
|
|
|
|
nmtst_create_minimal_connection(const char * id,
|
|
|
|
|
|
const char * uuid,
|
|
|
|
|
|
const char * type,
|
|
|
|
|
|
NMSettingConnection **out_s_con)
|
|
|
|
|
|
{
|
|
|
|
|
|
NMConnection * con;
|
|
|
|
|
|
NMSetting * s_base = NULL;
|
|
|
|
|
|
NMSettingConnection *s_con;
|
2014-08-07 22:23:20 +02:00
|
|
|
|
gs_free char * uuid_free = NULL;
|
2014-07-08 19:23:11 +02:00
|
|
|
|
|
|
|
|
|
|
g_assert(id);
|
|
|
|
|
|
|
|
|
|
|
|
if (uuid)
|
|
|
|
|
|
g_assert(nm_utils_is_uuid(uuid));
|
|
|
|
|
|
else
|
2014-08-07 22:23:20 +02:00
|
|
|
|
uuid = uuid_free = nm_utils_uuid_generate();
|
2014-07-08 19:23:11 +02:00
|
|
|
|
|
|
|
|
|
|
if (type) {
|
2015-12-22 14:28:14 +01:00
|
|
|
|
GType type_g;
|
|
|
|
|
|
|
|
|
|
|
|
#if defined(__NM_SIMPLE_CONNECTION_H__)
|
|
|
|
|
|
type_g = nm_setting_lookup_type(type);
|
|
|
|
|
|
#else
|
|
|
|
|
|
type_g = nm_connection_lookup_setting_type(type);
|
|
|
|
|
|
#endif
|
2014-07-08 19:23:11 +02:00
|
|
|
|
|
|
|
|
|
|
g_assert(type_g != G_TYPE_INVALID);
|
|
|
|
|
|
|
|
|
|
|
|
s_base = g_object_new(type_g, NULL);
|
|
|
|
|
|
g_assert(NM_IS_SETTING(s_base));
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2015-12-22 14:28:14 +01:00
|
|
|
|
#if defined(__NM_SIMPLE_CONNECTION_H__)
|
2014-08-13 14:34:29 -04:00
|
|
|
|
con = nm_simple_connection_new();
|
2015-12-22 14:28:14 +01:00
|
|
|
|
#else
|
|
|
|
|
|
con = nm_connection_new();
|
|
|
|
|
|
#endif
|
|
|
|
|
|
|
2020-03-23 19:29:24 +01:00
|
|
|
|
g_assert(con);
|
|
|
|
|
|
|
2014-07-08 19:23:11 +02:00
|
|
|
|
s_con = NM_SETTING_CONNECTION(nm_setting_connection_new());
|
|
|
|
|
|
|
2020-03-23 19:29:24 +01:00
|
|
|
|
g_assert(s_con);
|
|
|
|
|
|
|
2014-07-08 19:23:11 +02:00
|
|
|
|
g_object_set(s_con,
|
|
|
|
|
|
NM_SETTING_CONNECTION_ID,
|
|
|
|
|
|
id,
|
|
|
|
|
|
NM_SETTING_CONNECTION_UUID,
|
|
|
|
|
|
uuid,
|
|
|
|
|
|
NM_SETTING_CONNECTION_TYPE,
|
|
|
|
|
|
type,
|
|
|
|
|
|
NULL);
|
|
|
|
|
|
nm_connection_add_setting(con, NM_SETTING(s_con));
|
|
|
|
|
|
|
|
|
|
|
|
if (s_base)
|
|
|
|
|
|
nm_connection_add_setting(con, s_base);
|
|
|
|
|
|
|
|
|
|
|
|
if (out_s_con)
|
|
|
|
|
|
*out_s_con = s_con;
|
|
|
|
|
|
return con;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2017-02-23 15:24:18 +01:00
|
|
|
|
static inline gboolean
|
2014-07-08 12:28:20 +02:00
|
|
|
|
_nmtst_connection_normalize_v(NMConnection *connection, va_list args)
|
|
|
|
|
|
{
|
|
|
|
|
|
GError * error = NULL;
|
|
|
|
|
|
gboolean success;
|
|
|
|
|
|
gboolean was_modified = FALSE;
|
|
|
|
|
|
GHashTable *parameters = NULL;
|
|
|
|
|
|
const char *p_name;
|
|
|
|
|
|
|
|
|
|
|
|
g_assert(NM_IS_CONNECTION(connection));
|
|
|
|
|
|
|
|
|
|
|
|
while ((p_name = va_arg(args, const char *))) {
|
|
|
|
|
|
if (!parameters)
|
|
|
|
|
|
parameters = g_hash_table_new(g_str_hash, g_str_equal);
|
|
|
|
|
|
g_hash_table_insert(parameters, (gpointer *) p_name, va_arg(args, gpointer));
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
success = nm_connection_normalize(connection, parameters, &was_modified, &error);
|
|
|
|
|
|
g_assert_no_error(error);
|
|
|
|
|
|
g_assert(success);
|
|
|
|
|
|
|
|
|
|
|
|
if (parameters)
|
|
|
|
|
|
g_hash_table_destroy(parameters);
|
|
|
|
|
|
|
|
|
|
|
|
return was_modified;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2017-02-23 15:24:18 +01:00
|
|
|
|
static inline gboolean
|
2014-07-08 12:28:20 +02:00
|
|
|
|
_nmtst_connection_normalize(NMConnection *connection, ...)
|
|
|
|
|
|
{
|
|
|
|
|
|
gboolean was_modified;
|
|
|
|
|
|
va_list args;
|
|
|
|
|
|
|
|
|
|
|
|
va_start(args, connection);
|
|
|
|
|
|
was_modified = _nmtst_connection_normalize_v(connection, args);
|
|
|
|
|
|
va_end(args);
|
|
|
|
|
|
|
|
|
|
|
|
return was_modified;
|
|
|
|
|
|
}
|
|
|
|
|
|
#define nmtst_connection_normalize(connection, ...) \
|
|
|
|
|
|
_nmtst_connection_normalize(connection, ##__VA_ARGS__, NULL)
|
|
|
|
|
|
|
2017-02-23 15:24:18 +01:00
|
|
|
|
static inline NMConnection *
|
2014-07-08 12:28:20 +02:00
|
|
|
|
_nmtst_connection_duplicate_and_normalize(NMConnection *connection, ...)
|
|
|
|
|
|
{
|
|
|
|
|
|
va_list args;
|
|
|
|
|
|
|
2016-02-15 00:37:22 +01:00
|
|
|
|
connection = nmtst_clone_connection(connection);
|
2014-07-08 12:28:20 +02:00
|
|
|
|
|
|
|
|
|
|
va_start(args, connection);
|
2017-12-18 08:36:51 +01:00
|
|
|
|
_nmtst_connection_normalize_v(connection, args);
|
2014-07-08 12:28:20 +02:00
|
|
|
|
va_end(args);
|
|
|
|
|
|
|
|
|
|
|
|
return connection;
|
|
|
|
|
|
}
|
|
|
|
|
|
#define nmtst_connection_duplicate_and_normalize(connection, ...) \
|
|
|
|
|
|
_nmtst_connection_duplicate_and_normalize(connection, ##__VA_ARGS__, NULL)
|
|
|
|
|
|
|
2017-02-23 15:24:18 +01:00
|
|
|
|
static inline void
|
2014-07-08 13:13:13 +02:00
|
|
|
|
nmtst_assert_connection_equals(NMConnection *a,
|
|
|
|
|
|
gboolean normalize_a,
|
|
|
|
|
|
NMConnection *b,
|
|
|
|
|
|
gboolean normalize_b)
|
|
|
|
|
|
{
|
|
|
|
|
|
gboolean compare;
|
|
|
|
|
|
gs_unref_object NMConnection *a2 = NULL;
|
|
|
|
|
|
gs_unref_object NMConnection *b2 = NULL;
|
|
|
|
|
|
GHashTable * out_settings = NULL;
|
2020-09-28 16:03:33 +02:00
|
|
|
|
|
2014-07-08 13:13:13 +02:00
|
|
|
|
g_assert(NM_IS_CONNECTION(a));
|
|
|
|
|
|
g_assert(NM_IS_CONNECTION(b));
|
2020-09-28 16:03:33 +02:00
|
|
|
|
|
2014-07-08 13:13:13 +02:00
|
|
|
|
if (normalize_a)
|
|
|
|
|
|
a = a2 = nmtst_connection_duplicate_and_normalize(a);
|
|
|
|
|
|
if (normalize_b)
|
|
|
|
|
|
b = b2 = nmtst_connection_duplicate_and_normalize(b);
|
2020-09-28 16:03:33 +02:00
|
|
|
|
|
2014-07-08 13:13:13 +02:00
|
|
|
|
compare = nm_connection_diff(a, b, NM_SETTING_COMPARE_FLAG_EXACT, &out_settings);
|
2015-03-13 14:32:39 +01:00
|
|
|
|
if (!compare || out_settings) {
|
2014-07-08 13:13:13 +02:00
|
|
|
|
const char * name, *pname;
|
|
|
|
|
|
GHashTable * setting;
|
|
|
|
|
|
GHashTableIter iter, iter2;
|
2020-09-28 16:03:33 +02:00
|
|
|
|
|
2015-03-13 14:32:39 +01:00
|
|
|
|
__NMTST_LOG(g_message, ">>> ASSERTION nmtst_assert_connection_equals() fails");
|
|
|
|
|
|
if (out_settings) {
|
|
|
|
|
|
g_hash_table_iter_init(&iter, out_settings);
|
|
|
|
|
|
while (g_hash_table_iter_next(&iter, (gpointer *) &name, (gpointer *) &setting)) {
|
|
|
|
|
|
__NMTST_LOG(g_message, ">>> differences in setting '%s':", name);
|
2020-09-28 16:03:33 +02:00
|
|
|
|
|
2015-03-13 14:32:39 +01:00
|
|
|
|
g_hash_table_iter_init(&iter2, setting);
|
|
|
|
|
|
while (g_hash_table_iter_next(&iter2, (gpointer *) &pname, NULL))
|
|
|
|
|
|
__NMTST_LOG(g_message, ">>> differences in setting '%s.%s'", name, pname);
|
2020-09-28 16:03:33 +02:00
|
|
|
|
}
|
2015-03-13 14:32:39 +01:00
|
|
|
|
}
|
2020-09-28 16:03:33 +02:00
|
|
|
|
|
2015-03-13 14:32:55 +01:00
|
|
|
|
#ifdef __NM_KEYFILE_INTERNAL_H__
|
|
|
|
|
|
{
|
2020-09-02 17:36:08 +02:00
|
|
|
|
nm_auto_unref_keyfile GKeyFile *kf_a = NULL, *kf_b = NULL;
|
2015-03-13 14:32:55 +01:00
|
|
|
|
gs_free char * str_a = NULL, *str_b = NULL;
|
2020-09-28 16:03:33 +02:00
|
|
|
|
|
2020-05-26 09:55:40 +02:00
|
|
|
|
kf_a = nm_keyfile_write(a, NM_KEYFILE_HANDLER_FLAGS_NONE, NULL, NULL, NULL);
|
|
|
|
|
|
kf_b = nm_keyfile_write(b, NM_KEYFILE_HANDLER_FLAGS_NONE, NULL, NULL, NULL);
|
2020-09-28 16:03:33 +02:00
|
|
|
|
|
2015-03-13 14:32:55 +01:00
|
|
|
|
if (kf_a)
|
|
|
|
|
|
str_a = g_key_file_to_data(kf_a, NULL, NULL);
|
|
|
|
|
|
if (kf_b)
|
|
|
|
|
|
str_b = g_key_file_to_data(kf_b, NULL, NULL);
|
2020-09-28 16:03:33 +02:00
|
|
|
|
|
2015-03-13 14:32:55 +01:00
|
|
|
|
__NMTST_LOG(g_message,
|
|
|
|
|
|
">>> Connection A as kf (*WARNING: keyfile representation might not show "
|
|
|
|
|
|
"the difference*):\n%s",
|
|
|
|
|
|
str_a);
|
|
|
|
|
|
__NMTST_LOG(g_message,
|
|
|
|
|
|
">>> Connection B as kf (*WARNING: keyfile representation might not show "
|
|
|
|
|
|
"the difference*):\n%s",
|
|
|
|
|
|
str_b);
|
|
|
|
|
|
}
|
|
|
|
|
|
#endif
|
2014-07-08 13:13:13 +02:00
|
|
|
|
}
|
|
|
|
|
|
g_assert(compare);
|
|
|
|
|
|
g_assert(!out_settings);
|
2020-09-28 16:03:33 +02:00
|
|
|
|
|
2014-07-08 13:13:13 +02:00
|
|
|
|
compare = nm_connection_compare(a, b, NM_SETTING_COMPARE_FLAG_EXACT);
|
|
|
|
|
|
g_assert(compare);
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2017-02-23 15:24:18 +01:00
|
|
|
|
static inline void
|
2016-02-15 00:37:22 +01:00
|
|
|
|
nmtst_assert_connection_verifies(NMConnection *con)
|
2014-07-18 23:35:22 +02:00
|
|
|
|
{
|
2016-02-15 00:37:22 +01:00
|
|
|
|
/* assert that the connection does verify, it might be normaliziable or not */
|
2014-07-18 23:35:22 +02:00
|
|
|
|
GError * error = NULL;
|
|
|
|
|
|
gboolean success;
|
|
|
|
|
|
|
|
|
|
|
|
g_assert(NM_IS_CONNECTION(con));
|
|
|
|
|
|
|
|
|
|
|
|
success = nm_connection_verify(con, &error);
|
|
|
|
|
|
g_assert_no_error(error);
|
|
|
|
|
|
g_assert(success);
|
2016-02-15 00:37:22 +01:00
|
|
|
|
}
|
|
|
|
|
|
|
2017-02-23 15:24:18 +01:00
|
|
|
|
static inline void
|
2016-02-15 00:37:22 +01:00
|
|
|
|
nmtst_assert_connection_verifies_without_normalization(NMConnection *con)
|
|
|
|
|
|
{
|
|
|
|
|
|
/* assert that the connection verifies and does not need any normalization */
|
|
|
|
|
|
GError * error = NULL;
|
|
|
|
|
|
gboolean success;
|
|
|
|
|
|
gboolean was_modified = FALSE;
|
|
|
|
|
|
gs_unref_object NMConnection *clone = NULL;
|
|
|
|
|
|
|
|
|
|
|
|
clone = nmtst_clone_connection(con);
|
|
|
|
|
|
|
|
|
|
|
|
nmtst_assert_connection_verifies(con);
|
2014-07-18 23:35:22 +02:00
|
|
|
|
|
2016-02-15 00:37:22 +01:00
|
|
|
|
success = nm_connection_normalize(clone, NULL, &was_modified, &error);
|
2014-07-18 23:35:22 +02:00
|
|
|
|
g_assert_no_error(error);
|
|
|
|
|
|
g_assert(success);
|
|
|
|
|
|
nmtst_assert_connection_equals(con, FALSE, clone, FALSE);
|
2014-09-24 10:17:50 +02:00
|
|
|
|
g_assert(!was_modified);
|
2014-07-18 23:35:22 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
2017-02-23 15:24:18 +01:00
|
|
|
|
static inline void
|
2014-07-18 23:35:22 +02:00
|
|
|
|
nmtst_assert_connection_verifies_and_normalizable(NMConnection *con)
|
|
|
|
|
|
{
|
|
|
|
|
|
/* assert that the connection does verify, but normalization still modifies it */
|
|
|
|
|
|
GError * error = NULL;
|
|
|
|
|
|
gboolean success;
|
|
|
|
|
|
gboolean was_modified = FALSE;
|
2016-02-15 00:37:22 +01:00
|
|
|
|
gs_unref_object NMConnection *clone = NULL;
|
2014-07-18 23:35:22 +02:00
|
|
|
|
|
2016-02-15 00:37:22 +01:00
|
|
|
|
clone = nmtst_clone_connection(con);
|
2014-07-18 23:35:22 +02:00
|
|
|
|
|
2016-02-15 00:37:22 +01:00
|
|
|
|
nmtst_assert_connection_verifies(con);
|
2014-07-18 23:35:22 +02:00
|
|
|
|
|
2016-02-15 00:37:22 +01:00
|
|
|
|
success = nm_connection_normalize(clone, NULL, &was_modified, &error);
|
2014-07-18 23:35:22 +02:00
|
|
|
|
g_assert_no_error(error);
|
|
|
|
|
|
g_assert(success);
|
|
|
|
|
|
g_assert(was_modified);
|
|
|
|
|
|
|
|
|
|
|
|
/* again! */
|
2016-02-15 00:37:22 +01:00
|
|
|
|
nmtst_assert_connection_verifies_without_normalization(clone);
|
2014-07-18 23:35:22 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
2017-02-23 15:24:18 +01:00
|
|
|
|
static inline void
|
2014-07-18 23:35:22 +02:00
|
|
|
|
nmtst_assert_connection_verifies_after_normalization(NMConnection *con,
|
|
|
|
|
|
GQuark expect_error_domain,
|
all: don't use gchar/gshort/gint/glong but C types
We commonly don't use the glib typedefs for char/short/int/long,
but their C types directly.
$ git grep '\<g\(char\|short\|int\|long\|float\|double\)\>' | wc -l
587
$ git grep '\<\(char\|short\|int\|long\|float\|double\)\>' | wc -l
21114
One could argue that using the glib typedefs is preferable in
public API (of our glib based libnm library) or where it clearly
is related to glib, like during
g_object_set (obj, PROPERTY, (gint) value, NULL);
However, that argument does not seem strong, because in practice we don't
follow that argument today, and seldomly use the glib typedefs.
Also, the style guide for this would be hard to formalize, because
"using them where clearly related to a glib" is a very loose suggestion.
Also note that glib typedefs will always just be typedefs of the
underlying C types. There is no danger of glib changing the meaning
of these typedefs (because that would be a major API break of glib).
A simple style guide is instead: don't use these typedefs.
No manual actions, I only ran the bash script:
FILES=($(git ls-files '*.[hc]'))
sed -i \
-e 's/\<g\(char\|short\|int\|long\|float\|double\)\>\( [^ ]\)/\1\2/g' \
-e 's/\<g\(char\|short\|int\|long\|float\|double\)\> /\1 /g' \
-e 's/\<g\(char\|short\|int\|long\|float\|double\)\>/\1/g' \
"${FILES[@]}"
2018-07-11 07:40:19 +02:00
|
|
|
|
int expect_error_code)
|
2014-07-18 23:35:22 +02:00
|
|
|
|
{
|
|
|
|
|
|
/* assert that the connection does not verify, but normalization does fix it */
|
|
|
|
|
|
GError * error = NULL;
|
|
|
|
|
|
gboolean success;
|
|
|
|
|
|
gboolean was_modified = FALSE;
|
2016-02-15 00:37:22 +01:00
|
|
|
|
gs_unref_object NMConnection *clone = NULL;
|
2014-07-18 23:35:22 +02:00
|
|
|
|
|
2016-02-15 00:37:22 +01:00
|
|
|
|
clone = nmtst_clone_connection(con);
|
2014-07-18 23:35:22 +02:00
|
|
|
|
|
|
|
|
|
|
success = nm_connection_verify(con, &error);
|
|
|
|
|
|
nmtst_assert_error(error, expect_error_domain, expect_error_code, NULL);
|
|
|
|
|
|
g_assert(!success);
|
|
|
|
|
|
g_clear_error(&error);
|
|
|
|
|
|
|
2016-02-15 00:37:22 +01:00
|
|
|
|
success = nm_connection_normalize(clone, NULL, &was_modified, &error);
|
2014-07-18 23:35:22 +02:00
|
|
|
|
g_assert_no_error(error);
|
|
|
|
|
|
g_assert(success);
|
|
|
|
|
|
g_assert(was_modified);
|
|
|
|
|
|
|
|
|
|
|
|
/* again! */
|
2016-02-15 00:37:22 +01:00
|
|
|
|
nmtst_assert_connection_verifies_without_normalization(clone);
|
2014-07-18 23:35:22 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
2017-02-23 15:24:18 +01:00
|
|
|
|
static inline void
|
2014-07-18 23:35:22 +02:00
|
|
|
|
nmtst_assert_connection_unnormalizable(NMConnection *con,
|
|
|
|
|
|
GQuark expect_error_domain,
|
all: don't use gchar/gshort/gint/glong but C types
We commonly don't use the glib typedefs for char/short/int/long,
but their C types directly.
$ git grep '\<g\(char\|short\|int\|long\|float\|double\)\>' | wc -l
587
$ git grep '\<\(char\|short\|int\|long\|float\|double\)\>' | wc -l
21114
One could argue that using the glib typedefs is preferable in
public API (of our glib based libnm library) or where it clearly
is related to glib, like during
g_object_set (obj, PROPERTY, (gint) value, NULL);
However, that argument does not seem strong, because in practice we don't
follow that argument today, and seldomly use the glib typedefs.
Also, the style guide for this would be hard to formalize, because
"using them where clearly related to a glib" is a very loose suggestion.
Also note that glib typedefs will always just be typedefs of the
underlying C types. There is no danger of glib changing the meaning
of these typedefs (because that would be a major API break of glib).
A simple style guide is instead: don't use these typedefs.
No manual actions, I only ran the bash script:
FILES=($(git ls-files '*.[hc]'))
sed -i \
-e 's/\<g\(char\|short\|int\|long\|float\|double\)\>\( [^ ]\)/\1\2/g' \
-e 's/\<g\(char\|short\|int\|long\|float\|double\)\> /\1 /g' \
-e 's/\<g\(char\|short\|int\|long\|float\|double\)\>/\1/g' \
"${FILES[@]}"
2018-07-11 07:40:19 +02:00
|
|
|
|
int expect_error_code)
|
2014-07-18 23:35:22 +02:00
|
|
|
|
{
|
|
|
|
|
|
/* assert that the connection does not verify, and it cannot be fixed by normalization */
|
|
|
|
|
|
|
|
|
|
|
|
GError * error = NULL;
|
|
|
|
|
|
gboolean success;
|
|
|
|
|
|
gboolean was_modified = FALSE;
|
2016-02-15 00:37:22 +01:00
|
|
|
|
gs_unref_object NMConnection *clone = NULL;
|
2014-07-18 23:35:22 +02:00
|
|
|
|
|
2016-02-15 00:37:22 +01:00
|
|
|
|
clone = nmtst_clone_connection(con);
|
2014-07-18 23:35:22 +02:00
|
|
|
|
|
|
|
|
|
|
success = nm_connection_verify(con, &error);
|
|
|
|
|
|
nmtst_assert_error(error, expect_error_domain, expect_error_code, NULL);
|
|
|
|
|
|
g_assert(!success);
|
|
|
|
|
|
g_clear_error(&error);
|
|
|
|
|
|
|
2016-02-15 00:37:22 +01:00
|
|
|
|
success = nm_connection_normalize(clone, NULL, &was_modified, &error);
|
2014-07-18 23:35:22 +02:00
|
|
|
|
nmtst_assert_error(error, expect_error_domain, expect_error_code, NULL);
|
|
|
|
|
|
g_assert(!success);
|
|
|
|
|
|
g_assert(!was_modified);
|
2016-02-15 00:37:22 +01:00
|
|
|
|
nmtst_assert_connection_equals(con, FALSE, clone, FALSE);
|
2014-07-18 23:35:22 +02:00
|
|
|
|
g_clear_error(&error);
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2017-02-23 15:24:18 +01:00
|
|
|
|
static inline void
|
2014-12-12 14:42:27 +01:00
|
|
|
|
nmtst_assert_setting_verifies(NMSetting *setting)
|
|
|
|
|
|
{
|
|
|
|
|
|
/* assert that the setting verifies without an error */
|
|
|
|
|
|
|
|
|
|
|
|
GError * error = NULL;
|
|
|
|
|
|
gboolean success;
|
|
|
|
|
|
|
|
|
|
|
|
g_assert(NM_IS_SETTING(setting));
|
|
|
|
|
|
|
|
|
|
|
|
success = nm_setting_verify(setting, NULL, &error);
|
|
|
|
|
|
g_assert_no_error(error);
|
|
|
|
|
|
g_assert(success);
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2017-11-20 19:51:05 +01:00
|
|
|
|
#if defined(__NM_SIMPLE_CONNECTION_H__) && NM_CHECK_VERSION(1, 10, 0) \
|
|
|
|
|
|
&& (!defined(NM_VERSION_MAX_ALLOWED) || NM_VERSION_MAX_ALLOWED >= NM_VERSION_1_10)
|
2017-10-29 16:03:53 +01:00
|
|
|
|
static inline void
|
|
|
|
|
|
_nmtst_assert_connection_has_settings(NMConnection *connection,
|
|
|
|
|
|
gboolean has_at_least,
|
|
|
|
|
|
gboolean has_at_most,
|
|
|
|
|
|
...)
|
|
|
|
|
|
{
|
|
|
|
|
|
gs_unref_hashtable GHashTable *names = NULL;
|
|
|
|
|
|
gs_free NMSetting **settings = NULL;
|
|
|
|
|
|
va_list ap;
|
|
|
|
|
|
const char * name;
|
|
|
|
|
|
guint i, len;
|
|
|
|
|
|
gs_unref_ptrarray GPtrArray *names_arr = NULL;
|
2020-09-28 16:03:33 +02:00
|
|
|
|
|
2017-10-29 16:03:53 +01:00
|
|
|
|
g_assert(NM_IS_CONNECTION(connection));
|
2020-09-28 16:03:33 +02:00
|
|
|
|
|
2017-10-29 16:03:53 +01:00
|
|
|
|
names = g_hash_table_new(g_str_hash, g_str_equal);
|
|
|
|
|
|
names_arr = g_ptr_array_new();
|
2020-09-28 16:03:33 +02:00
|
|
|
|
|
2017-10-29 16:03:53 +01:00
|
|
|
|
va_start(ap, has_at_most);
|
|
|
|
|
|
while ((name = va_arg(ap, const char *))) {
|
shared: restore compat code in nm-glib.h for 2.32 compatibility
In commit 8a46b25cfa8c33daa8af37bb8103ca02286001b1, NetworkManager
bumped its glib dependency to 2.40 or newer.
"nm-glib.h" header is precisely the compatiblity implementation that we
use to cope with older glib versions. Note, that the same implementation
is also used by applet and VPN plugins.
However, applet and VPN plugins don't yet require 2.40 glib. Also,
they don't yet require NetworkManager 1.12.0 API (which was the one
that bumped the glib requirement to 2.40). Hence, when "nm-glib.h"
is used in applet or VPN, it must still cope with older versions,
although, the code is not used by NetworkManager itself.
Partly revert 8a46b25cfa8c33daa8af37bb8103ca02286001b1 so that nm-glib.h
again works for 2.32 or newer.
The same is true, also for "nm-test-utils.h", which is also used by
applet and VPN plugins.
2018-07-09 13:20:17 +02:00
|
|
|
|
if (!nm_g_hash_table_add(names, (gpointer) name))
|
2017-10-29 16:03:53 +01:00
|
|
|
|
g_assert_not_reached();
|
|
|
|
|
|
g_ptr_array_add(names_arr, (gpointer) name);
|
|
|
|
|
|
}
|
|
|
|
|
|
va_end(ap);
|
2020-09-28 16:03:33 +02:00
|
|
|
|
|
2017-10-29 16:03:53 +01:00
|
|
|
|
g_ptr_array_add(names_arr, NULL);
|
2020-09-28 16:03:33 +02:00
|
|
|
|
|
2017-10-29 16:03:53 +01:00
|
|
|
|
settings = nm_connection_get_settings(connection, &len);
|
|
|
|
|
|
for (i = 0; i < len; i++) {
|
|
|
|
|
|
if (!g_hash_table_remove(names, nm_setting_get_name(settings[i])) && has_at_most) {
|
|
|
|
|
|
g_error(
|
|
|
|
|
|
"nmtst_assert_connection_has_settings(): has setting \"%s\" which is not expected",
|
|
|
|
|
|
nm_setting_get_name(settings[i]));
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
if (g_hash_table_size(names) > 0 && has_at_least) {
|
|
|
|
|
|
gs_free char * expected_str = g_strjoinv(" ", (char **) names_arr->pdata);
|
|
|
|
|
|
gs_free const char **settings_names = NULL;
|
|
|
|
|
|
gs_free char * has_str = NULL;
|
2020-09-28 16:03:33 +02:00
|
|
|
|
|
2017-10-29 16:03:53 +01:00
|
|
|
|
settings_names = g_new0(const char *, len + 1);
|
|
|
|
|
|
for (i = 0; i < len; i++)
|
|
|
|
|
|
settings_names[i] = nm_setting_get_name(settings[i]);
|
|
|
|
|
|
has_str = g_strjoinv(" ", (char **) settings_names);
|
2020-09-28 16:03:33 +02:00
|
|
|
|
|
2017-10-29 16:03:53 +01:00
|
|
|
|
g_error("nmtst_assert_connection_has_settings(): the setting lacks %u expected settings "
|
|
|
|
|
|
"(expected: [%s] vs. has: [%s])",
|
|
|
|
|
|
g_hash_table_size(names),
|
|
|
|
|
|
expected_str,
|
|
|
|
|
|
has_str);
|
2020-09-28 16:03:33 +02:00
|
|
|
|
}
|
2017-10-29 16:03:53 +01:00
|
|
|
|
}
|
|
|
|
|
|
#define nmtst_assert_connection_has_settings(connection, ...) \
|
|
|
|
|
|
_nmtst_assert_connection_has_settings((connection), TRUE, TRUE, __VA_ARGS__, NULL)
|
|
|
|
|
|
#define nmtst_assert_connection_has_settings_at_least(connection, ...) \
|
|
|
|
|
|
_nmtst_assert_connection_has_settings((connection), TRUE, FALSE, __VA_ARGS__, NULL)
|
|
|
|
|
|
#define nmtst_assert_connection_has_settings_at_most(connection, ...) \
|
|
|
|
|
|
_nmtst_assert_connection_has_settings((connection), FALSE, TRUE, __VA_ARGS__, NULL)
|
2017-11-20 19:51:05 +01:00
|
|
|
|
#endif
|
2017-10-29 16:03:53 +01:00
|
|
|
|
|
2017-02-23 15:24:18 +01:00
|
|
|
|
static inline void
|
2014-12-12 14:42:27 +01:00
|
|
|
|
nmtst_assert_setting_verify_fails(NMSetting *setting,
|
|
|
|
|
|
GQuark expect_error_domain,
|
all: don't use gchar/gshort/gint/glong but C types
We commonly don't use the glib typedefs for char/short/int/long,
but their C types directly.
$ git grep '\<g\(char\|short\|int\|long\|float\|double\)\>' | wc -l
587
$ git grep '\<\(char\|short\|int\|long\|float\|double\)\>' | wc -l
21114
One could argue that using the glib typedefs is preferable in
public API (of our glib based libnm library) or where it clearly
is related to glib, like during
g_object_set (obj, PROPERTY, (gint) value, NULL);
However, that argument does not seem strong, because in practice we don't
follow that argument today, and seldomly use the glib typedefs.
Also, the style guide for this would be hard to formalize, because
"using them where clearly related to a glib" is a very loose suggestion.
Also note that glib typedefs will always just be typedefs of the
underlying C types. There is no danger of glib changing the meaning
of these typedefs (because that would be a major API break of glib).
A simple style guide is instead: don't use these typedefs.
No manual actions, I only ran the bash script:
FILES=($(git ls-files '*.[hc]'))
sed -i \
-e 's/\<g\(char\|short\|int\|long\|float\|double\)\>\( [^ ]\)/\1\2/g' \
-e 's/\<g\(char\|short\|int\|long\|float\|double\)\> /\1 /g' \
-e 's/\<g\(char\|short\|int\|long\|float\|double\)\>/\1/g' \
"${FILES[@]}"
2018-07-11 07:40:19 +02:00
|
|
|
|
int expect_error_code)
|
2014-12-12 14:42:27 +01:00
|
|
|
|
{
|
|
|
|
|
|
/* assert that the setting verification fails */
|
|
|
|
|
|
|
|
|
|
|
|
GError * error = NULL;
|
|
|
|
|
|
gboolean success;
|
|
|
|
|
|
|
|
|
|
|
|
g_assert(NM_IS_SETTING(setting));
|
|
|
|
|
|
|
|
|
|
|
|
success = nm_setting_verify(setting, NULL, &error);
|
|
|
|
|
|
nmtst_assert_error(error, expect_error_domain, expect_error_code, NULL);
|
|
|
|
|
|
g_assert(!success);
|
|
|
|
|
|
g_clear_error(&error);
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2019-05-14 08:29:59 +02:00
|
|
|
|
static inline void
|
|
|
|
|
|
nmtst_assert_setting_is_equal(gconstpointer /* const NMSetting * */ a,
|
|
|
|
|
|
gconstpointer /* const NMSetting * */ b,
|
|
|
|
|
|
NMSettingCompareFlags flags)
|
|
|
|
|
|
{
|
|
|
|
|
|
gs_unref_hashtable GHashTable *hash = NULL;
|
2019-05-30 08:33:14 +02:00
|
|
|
|
guint32 r = nmtst_get_rand_uint32();
|
2019-05-14 08:29:59 +02:00
|
|
|
|
|
|
|
|
|
|
g_assert(NM_IS_SETTING(a));
|
|
|
|
|
|
g_assert(NM_IS_SETTING(b));
|
|
|
|
|
|
|
|
|
|
|
|
if (NM_FLAGS_HAS(r, 0x4))
|
2020-08-06 10:28:05 +02:00
|
|
|
|
NM_SWAP(&a, &b);
|
2019-05-14 08:29:59 +02:00
|
|
|
|
|
|
|
|
|
|
g_assert(nm_setting_compare((NMSetting *) a, (NMSetting *) b, flags));
|
|
|
|
|
|
|
|
|
|
|
|
if (NM_FLAGS_HAS(r, 0x8))
|
2020-08-06 10:28:05 +02:00
|
|
|
|
NM_SWAP(&a, &b);
|
2019-05-14 08:29:59 +02:00
|
|
|
|
|
|
|
|
|
|
g_assert(nm_setting_diff((NMSetting *) a, (NMSetting *) b, flags, NM_FLAGS_HAS(r, 0x1), &hash));
|
|
|
|
|
|
g_assert(!hash);
|
|
|
|
|
|
}
|
2014-07-08 19:23:11 +02:00
|
|
|
|
#endif
|
2014-03-14 17:49:49 +01:00
|
|
|
|
|
2019-05-14 08:49:01 +02:00
|
|
|
|
#ifdef __NM_SETTING_PRIVATE_H__
|
|
|
|
|
|
static inline NMSetting *
|
|
|
|
|
|
nmtst_assert_setting_dbus_new(GType gtype, GVariant *variant)
|
|
|
|
|
|
{
|
|
|
|
|
|
NMSetting * setting;
|
|
|
|
|
|
gs_free_error GError *error = NULL;
|
|
|
|
|
|
|
|
|
|
|
|
g_assert(g_type_is_a(gtype, NM_TYPE_SETTING));
|
|
|
|
|
|
g_assert(gtype != NM_TYPE_SETTING);
|
|
|
|
|
|
g_assert(variant);
|
|
|
|
|
|
g_assert(g_variant_is_of_type(variant, NM_VARIANT_TYPE_SETTING));
|
|
|
|
|
|
|
|
|
|
|
|
setting =
|
|
|
|
|
|
_nm_setting_new_from_dbus(gtype, variant, NULL, NM_SETTING_PARSE_FLAGS_STRICT, &error);
|
|
|
|
|
|
nmtst_assert_success(setting, error);
|
|
|
|
|
|
return setting;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static inline void
|
|
|
|
|
|
nmtst_assert_setting_dbus_roundtrip(gconstpointer /* const NMSetting * */ setting)
|
|
|
|
|
|
{
|
|
|
|
|
|
gs_unref_object NMSetting *setting2 = NULL;
|
|
|
|
|
|
gs_unref_variant GVariant *variant = NULL;
|
|
|
|
|
|
|
|
|
|
|
|
g_assert(NM_IS_SETTING(setting));
|
|
|
|
|
|
|
2019-06-27 09:07:16 +02:00
|
|
|
|
variant = _nm_setting_to_dbus((NMSetting *) setting, NULL, NM_CONNECTION_SERIALIZE_ALL, NULL);
|
2019-05-14 08:49:01 +02:00
|
|
|
|
setting2 = nmtst_assert_setting_dbus_new(G_OBJECT_TYPE(setting), variant);
|
|
|
|
|
|
nmtst_assert_setting_is_equal(setting, setting2, NM_SETTING_COMPARE_FLAG_EXACT);
|
|
|
|
|
|
}
|
|
|
|
|
|
#endif
|
|
|
|
|
|
|
2014-07-30 15:37:31 -05:00
|
|
|
|
#ifdef __NM_UTILS_H__
|
|
|
|
|
|
static inline void
|
2016-02-03 13:34:38 +01:00
|
|
|
|
nmtst_assert_hwaddr_equals(gconstpointer hwaddr1,
|
|
|
|
|
|
gssize hwaddr1_len,
|
|
|
|
|
|
const char * expected,
|
|
|
|
|
|
const char * file,
|
|
|
|
|
|
int line)
|
2014-07-30 15:37:31 -05:00
|
|
|
|
{
|
|
|
|
|
|
guint8 buf2[NM_UTILS_HWADDR_LEN_MAX];
|
|
|
|
|
|
gsize hwaddr2_len = 1;
|
|
|
|
|
|
const char *p;
|
|
|
|
|
|
gboolean success;
|
2020-09-28 16:03:33 +02:00
|
|
|
|
|
2014-07-30 15:37:31 -05:00
|
|
|
|
g_assert(hwaddr1_len > 0 && hwaddr1_len <= NM_UTILS_HWADDR_LEN_MAX);
|
2020-09-28 16:03:33 +02:00
|
|
|
|
|
2014-07-30 15:37:31 -05:00
|
|
|
|
g_assert(expected);
|
|
|
|
|
|
for (p = expected; *p; p++) {
|
|
|
|
|
|
if (*p == ':' || *p == '-')
|
|
|
|
|
|
hwaddr2_len++;
|
|
|
|
|
|
}
|
|
|
|
|
|
g_assert(hwaddr2_len <= NM_UTILS_HWADDR_LEN_MAX);
|
|
|
|
|
|
g_assert(nm_utils_hwaddr_aton(expected, buf2, hwaddr2_len));
|
2020-09-28 16:03:33 +02:00
|
|
|
|
|
2014-07-30 15:37:31 -05:00
|
|
|
|
/* Manually check the entire hardware address instead of using
|
|
|
|
|
|
* nm_utils_hwaddr_matches() because that function doesn't compare
|
|
|
|
|
|
* entire InfiniBand addresses for various (legitimate) reasons.
|
|
|
|
|
|
*/
|
|
|
|
|
|
success = (hwaddr1_len == hwaddr2_len);
|
|
|
|
|
|
if (success)
|
|
|
|
|
|
success = !memcmp(hwaddr1, buf2, hwaddr1_len);
|
|
|
|
|
|
if (!success) {
|
2016-02-03 13:34:38 +01:00
|
|
|
|
g_error("assert: %s:%d: hwaddr '%s' (%zd) expected, but got %s (%zd)",
|
|
|
|
|
|
file,
|
|
|
|
|
|
line,
|
|
|
|
|
|
expected,
|
|
|
|
|
|
hwaddr2_len,
|
|
|
|
|
|
nm_utils_hwaddr_ntoa(hwaddr1, hwaddr1_len),
|
|
|
|
|
|
hwaddr1_len);
|
2014-07-30 15:37:31 -05:00
|
|
|
|
}
|
2020-09-28 16:03:33 +02:00
|
|
|
|
}
|
2014-07-30 15:37:31 -05:00
|
|
|
|
#define nmtst_assert_hwaddr_equals(hwaddr1, hwaddr1_len, expected) \
|
2016-02-03 13:34:38 +01:00
|
|
|
|
nmtst_assert_hwaddr_equals(hwaddr1, hwaddr1_len, expected, __FILE__, __LINE__)
|
2014-07-30 15:37:31 -05:00
|
|
|
|
#endif
|
2014-07-08 12:28:20 +02:00
|
|
|
|
|
2015-02-27 10:24:09 +01:00
|
|
|
|
#if defined(__NM_SIMPLE_CONNECTION_H__) && defined(__NM_SETTING_CONNECTION_H__) \
|
|
|
|
|
|
&& defined(__NM_KEYFILE_INTERNAL_H__)
|
|
|
|
|
|
|
2017-02-23 15:24:18 +01:00
|
|
|
|
static inline NMConnection *
|
keyfile: split automatically setting ID/UUID for keyfile
keyfile already supports omitting the "connection.id" and
"connection.uuid". In that case, the ID would be taken from the
keyfile's name, and the UUID was generated by md5 hashing the
full filename.
No longer do this during nm_keyfile_read(), instead let all
callers call nm_keyfile_read_ensure_*() to their liking. This is done
for two reasons:
- a minor reason is, that one day we want to expose keyfile API
as public API. That means, we also want to read keyfiles from
stdin, where there is no filename available. The implementation
which parses stdio needs to define their own way of auto-generating
ID and UUID. Note how nm_keyfile_read()'s API no longer takes a
filename as argument, which would be awkward for the stdin case.
- Currently, we only support one keyfile directory, which (configurably)
is "/etc/NetworkManager/system-connections".
In the future, we want to support multiple keyfile dirctories, like
"/var/run/NetworkManager/profiles" or "/usr/lib/NetworkManager/profiles".
Here we want that a file "foo" (which does not specify a UUID) gets the
same UUID regardless of the directory it is in. That seems better, because
then the UUID won't change as you move the file between directories.
Yes, that means, that the same UUID will be provided by multiple
files, but NetworkManager must already cope with that situation anyway.
Unfortunately, the UUID generation scheme hashes the full path. That
means, we must hash the path name of the file "foo" inside the
original "system-connections" directory.
Refactor the code so that it accounds for a difference between the
filename of the keyfile, and the profile_dir used for generating
the UUID.
2018-10-02 19:53:54 +02:00
|
|
|
|
nmtst_create_connection_from_keyfile(const char *keyfile_str, const char *full_filename)
|
2015-02-27 10:24:09 +01:00
|
|
|
|
{
|
2020-09-02 17:36:08 +02:00
|
|
|
|
nm_auto_unref_keyfile GKeyFile *keyfile = NULL;
|
2019-01-03 13:22:28 +01:00
|
|
|
|
gs_free_error GError *error = NULL;
|
2015-02-27 10:24:09 +01:00
|
|
|
|
gboolean success;
|
|
|
|
|
|
NMConnection * con;
|
keyfile: split automatically setting ID/UUID for keyfile
keyfile already supports omitting the "connection.id" and
"connection.uuid". In that case, the ID would be taken from the
keyfile's name, and the UUID was generated by md5 hashing the
full filename.
No longer do this during nm_keyfile_read(), instead let all
callers call nm_keyfile_read_ensure_*() to their liking. This is done
for two reasons:
- a minor reason is, that one day we want to expose keyfile API
as public API. That means, we also want to read keyfiles from
stdin, where there is no filename available. The implementation
which parses stdio needs to define their own way of auto-generating
ID and UUID. Note how nm_keyfile_read()'s API no longer takes a
filename as argument, which would be awkward for the stdin case.
- Currently, we only support one keyfile directory, which (configurably)
is "/etc/NetworkManager/system-connections".
In the future, we want to support multiple keyfile dirctories, like
"/var/run/NetworkManager/profiles" or "/usr/lib/NetworkManager/profiles".
Here we want that a file "foo" (which does not specify a UUID) gets the
same UUID regardless of the directory it is in. That seems better, because
then the UUID won't change as you move the file between directories.
Yes, that means, that the same UUID will be provided by multiple
files, but NetworkManager must already cope with that situation anyway.
Unfortunately, the UUID generation scheme hashes the full path. That
means, we must hash the path name of the file "foo" inside the
original "system-connections" directory.
Refactor the code so that it accounds for a difference between the
filename of the keyfile, and the profile_dir used for generating
the UUID.
2018-10-02 19:53:54 +02:00
|
|
|
|
gs_free char * filename = g_path_get_basename(full_filename);
|
|
|
|
|
|
gs_free char * base_dir = g_path_get_dirname(full_filename);
|
2015-02-27 10:24:09 +01:00
|
|
|
|
|
|
|
|
|
|
g_assert(keyfile_str);
|
keyfile: split automatically setting ID/UUID for keyfile
keyfile already supports omitting the "connection.id" and
"connection.uuid". In that case, the ID would be taken from the
keyfile's name, and the UUID was generated by md5 hashing the
full filename.
No longer do this during nm_keyfile_read(), instead let all
callers call nm_keyfile_read_ensure_*() to their liking. This is done
for two reasons:
- a minor reason is, that one day we want to expose keyfile API
as public API. That means, we also want to read keyfiles from
stdin, where there is no filename available. The implementation
which parses stdio needs to define their own way of auto-generating
ID and UUID. Note how nm_keyfile_read()'s API no longer takes a
filename as argument, which would be awkward for the stdin case.
- Currently, we only support one keyfile directory, which (configurably)
is "/etc/NetworkManager/system-connections".
In the future, we want to support multiple keyfile dirctories, like
"/var/run/NetworkManager/profiles" or "/usr/lib/NetworkManager/profiles".
Here we want that a file "foo" (which does not specify a UUID) gets the
same UUID regardless of the directory it is in. That seems better, because
then the UUID won't change as you move the file between directories.
Yes, that means, that the same UUID will be provided by multiple
files, but NetworkManager must already cope with that situation anyway.
Unfortunately, the UUID generation scheme hashes the full path. That
means, we must hash the path name of the file "foo" inside the
original "system-connections" directory.
Refactor the code so that it accounds for a difference between the
filename of the keyfile, and the profile_dir used for generating
the UUID.
2018-10-02 19:53:54 +02:00
|
|
|
|
g_assert(full_filename && full_filename[0] == '/');
|
2015-02-27 10:24:09 +01:00
|
|
|
|
|
|
|
|
|
|
keyfile = g_key_file_new();
|
|
|
|
|
|
success = g_key_file_load_from_data(keyfile,
|
|
|
|
|
|
keyfile_str,
|
|
|
|
|
|
strlen(keyfile_str),
|
|
|
|
|
|
G_KEY_FILE_NONE,
|
|
|
|
|
|
&error);
|
2019-01-03 13:22:28 +01:00
|
|
|
|
nmtst_assert_success(success, error);
|
2015-02-27 10:24:09 +01:00
|
|
|
|
|
2020-05-26 09:55:40 +02:00
|
|
|
|
con = nm_keyfile_read(keyfile, base_dir, NM_KEYFILE_HANDLER_FLAGS_NONE, NULL, NULL, &error);
|
2019-01-03 13:22:28 +01:00
|
|
|
|
nmtst_assert_success(NM_IS_CONNECTION(con), error);
|
2015-02-27 10:24:09 +01:00
|
|
|
|
|
keyfile: split automatically setting ID/UUID for keyfile
keyfile already supports omitting the "connection.id" and
"connection.uuid". In that case, the ID would be taken from the
keyfile's name, and the UUID was generated by md5 hashing the
full filename.
No longer do this during nm_keyfile_read(), instead let all
callers call nm_keyfile_read_ensure_*() to their liking. This is done
for two reasons:
- a minor reason is, that one day we want to expose keyfile API
as public API. That means, we also want to read keyfiles from
stdin, where there is no filename available. The implementation
which parses stdio needs to define their own way of auto-generating
ID and UUID. Note how nm_keyfile_read()'s API no longer takes a
filename as argument, which would be awkward for the stdin case.
- Currently, we only support one keyfile directory, which (configurably)
is "/etc/NetworkManager/system-connections".
In the future, we want to support multiple keyfile dirctories, like
"/var/run/NetworkManager/profiles" or "/usr/lib/NetworkManager/profiles".
Here we want that a file "foo" (which does not specify a UUID) gets the
same UUID regardless of the directory it is in. That seems better, because
then the UUID won't change as you move the file between directories.
Yes, that means, that the same UUID will be provided by multiple
files, but NetworkManager must already cope with that situation anyway.
Unfortunately, the UUID generation scheme hashes the full path. That
means, we must hash the path name of the file "foo" inside the
original "system-connections" directory.
Refactor the code so that it accounds for a difference between the
filename of the keyfile, and the profile_dir used for generating
the UUID.
2018-10-02 19:53:54 +02:00
|
|
|
|
nm_keyfile_read_ensure_id(con, filename);
|
|
|
|
|
|
nm_keyfile_read_ensure_uuid(con, full_filename);
|
|
|
|
|
|
|
2015-02-27 10:24:09 +01:00
|
|
|
|
nmtst_connection_normalize(con);
|
|
|
|
|
|
|
|
|
|
|
|
return con;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
#endif
|
|
|
|
|
|
|
2014-09-05 14:32:17 -04:00
|
|
|
|
#ifdef __NM_CONNECTION_H__
|
|
|
|
|
|
|
2017-02-23 15:24:18 +01:00
|
|
|
|
static inline GVariant *
|
2016-03-17 12:42:54 +01:00
|
|
|
|
_nmtst_variant_new_vardict(int dummy, ...)
|
|
|
|
|
|
{
|
|
|
|
|
|
GVariantBuilder builder;
|
|
|
|
|
|
va_list ap;
|
|
|
|
|
|
const char * name;
|
|
|
|
|
|
GVariant * variant;
|
2020-09-28 16:03:33 +02:00
|
|
|
|
|
2016-03-17 12:42:54 +01:00
|
|
|
|
g_variant_builder_init(&builder, G_VARIANT_TYPE_VARDICT);
|
2020-09-28 16:03:33 +02:00
|
|
|
|
|
2016-03-17 12:42:54 +01:00
|
|
|
|
va_start(ap, dummy);
|
|
|
|
|
|
while ((name = va_arg(ap, const char *))) {
|
|
|
|
|
|
variant = va_arg(ap, GVariant *);
|
|
|
|
|
|
g_variant_builder_add(&builder, "{sv}", name, variant);
|
|
|
|
|
|
}
|
|
|
|
|
|
va_end(ap);
|
2020-09-28 16:03:33 +02:00
|
|
|
|
|
2016-03-17 12:42:54 +01:00
|
|
|
|
return g_variant_builder_end(&builder);
|
|
|
|
|
|
}
|
|
|
|
|
|
#define nmtst_variant_new_vardict(...) _nmtst_variant_new_vardict(0, __VA_ARGS__, NULL)
|
2020-09-28 16:03:33 +02:00
|
|
|
|
|
2016-03-10 14:40:39 +01:00
|
|
|
|
#define nmtst_assert_variant_is_of_type(variant, type) \
|
|
|
|
|
|
G_STMT_START \
|
|
|
|
|
|
{ \
|
|
|
|
|
|
GVariant *_variantx = (variant); \
|
|
|
|
|
|
\
|
|
|
|
|
|
g_assert(_variantx); \
|
|
|
|
|
|
g_assert(g_variant_is_of_type(_variantx, (type))); \
|
|
|
|
|
|
} \
|
|
|
|
|
|
G_STMT_END
|
2020-09-28 16:03:33 +02:00
|
|
|
|
|
2016-03-10 14:40:39 +01:00
|
|
|
|
#define nmtst_assert_variant_uint32(variant, val) \
|
|
|
|
|
|
G_STMT_START \
|
|
|
|
|
|
{ \
|
|
|
|
|
|
GVariant *_variant = (variant); \
|
|
|
|
|
|
\
|
|
|
|
|
|
nmtst_assert_variant_is_of_type(_variant, G_VARIANT_TYPE_UINT32); \
|
|
|
|
|
|
g_assert_cmpint(g_variant_get_uint32(_variant), ==, (val)); \
|
|
|
|
|
|
} \
|
|
|
|
|
|
G_STMT_END
|
2020-09-28 16:03:33 +02:00
|
|
|
|
|
2016-03-10 14:40:39 +01:00
|
|
|
|
#define nmtst_assert_variant_string(variant, str) \
|
|
|
|
|
|
G_STMT_START \
|
|
|
|
|
|
{ \
|
|
|
|
|
|
gsize _l; \
|
|
|
|
|
|
GVariant * _variant = (variant); \
|
|
|
|
|
|
const char *_str = (str); \
|
|
|
|
|
|
\
|
|
|
|
|
|
nmtst_assert_variant_is_of_type(_variant, G_VARIANT_TYPE_STRING); \
|
|
|
|
|
|
g_assert(_str); \
|
|
|
|
|
|
g_assert_cmpstr(g_variant_get_string(_variant, &_l), ==, _str); \
|
|
|
|
|
|
g_assert_cmpint(_l, ==, strlen(_str)); \
|
|
|
|
|
|
} \
|
|
|
|
|
|
G_STMT_END
|
2020-09-28 16:03:33 +02:00
|
|
|
|
|
2020-06-05 21:26:22 +02:00
|
|
|
|
#ifdef __NM_SHARED_UTILS_H__
|
|
|
|
|
|
#define _nmtst_assert_variant_bytestring_cmp_str(_ptr, _ptr2, _len) \
|
|
|
|
|
|
G_STMT_START \
|
|
|
|
|
|
{ \
|
|
|
|
|
|
if (memcmp(_ptr2, _ptr, _len) != 0) { \
|
|
|
|
|
|
gs_free char *_x1 = NULL; \
|
|
|
|
|
|
gs_free char *_x2 = NULL; \
|
|
|
|
|
|
const char * _xx1; \
|
|
|
|
|
|
const char * _xx2; \
|
|
|
|
|
|
\
|
|
|
|
|
|
_xx1 = nm_utils_buf_utf8safe_escape(_ptr, \
|
|
|
|
|
|
_len, \
|
|
|
|
|
|
NM_UTILS_STR_UTF8_SAFE_FLAG_ESCAPE_CTRL, \
|
|
|
|
|
|
&_x1); \
|
|
|
|
|
|
_xx2 = nm_utils_buf_utf8safe_escape(_ptr2, \
|
|
|
|
|
|
_len, \
|
|
|
|
|
|
NM_UTILS_STR_UTF8_SAFE_FLAG_ESCAPE_CTRL, \
|
|
|
|
|
|
&_x2); \
|
|
|
|
|
|
g_assert_cmpstr(_xx1, ==, _xx2); \
|
|
|
|
|
|
g_assert_not_reached(); \
|
|
|
|
|
|
} \
|
|
|
|
|
|
} \
|
|
|
|
|
|
G_STMT_END
|
|
|
|
|
|
#else
|
|
|
|
|
|
#define _nmtst_assert_variant_bytestring_cmp_str(_ptr, _ptr2, _len) \
|
|
|
|
|
|
G_STMT_START {} \
|
|
|
|
|
|
G_STMT_END
|
|
|
|
|
|
#endif
|
2020-09-28 16:03:33 +02:00
|
|
|
|
|
2020-06-05 21:26:22 +02:00
|
|
|
|
#define nmtst_assert_variant_bytestring(variant, ptr, len) \
|
|
|
|
|
|
G_STMT_START \
|
|
|
|
|
|
{ \
|
|
|
|
|
|
GVariant * _variant = (variant); \
|
|
|
|
|
|
gconstpointer _ptr = (ptr); \
|
|
|
|
|
|
gconstpointer _ptr2; \
|
|
|
|
|
|
gsize _len = (len); \
|
|
|
|
|
|
gsize _len2; \
|
|
|
|
|
|
\
|
|
|
|
|
|
nmtst_assert_variant_is_of_type(_variant, G_VARIANT_TYPE_BYTESTRING); \
|
|
|
|
|
|
_ptr2 = g_variant_get_fixed_array(_variant, &_len2, 1); \
|
|
|
|
|
|
g_assert_cmpint(_len2, ==, _len); \
|
|
|
|
|
|
if (_len != 0 && _ptr) { \
|
|
|
|
|
|
_nmtst_assert_variant_bytestring_cmp_str(_ptr, _ptr2, _len); \
|
|
|
|
|
|
g_assert_cmpmem(_ptr2, _len2, _ptr, _len); \
|
2020-09-28 16:03:33 +02:00
|
|
|
|
} \
|
2020-06-05 21:26:22 +02:00
|
|
|
|
} \
|
|
|
|
|
|
G_STMT_END
|
|
|
|
|
|
|
2014-09-05 14:32:17 -04:00
|
|
|
|
typedef enum {
|
|
|
|
|
|
NMTST_VARIANT_EDITOR_CONNECTION,
|
|
|
|
|
|
NMTST_VARIANT_EDITOR_SETTING,
|
|
|
|
|
|
NMTST_VARIANT_EDITOR_PROPERTY
|
|
|
|
|
|
} NmtstVariantEditorPhase;
|
|
|
|
|
|
|
|
|
|
|
|
#define NMTST_VARIANT_EDITOR(__connection_variant, __code) \
|
|
|
|
|
|
G_STMT_START \
|
|
|
|
|
|
{ \
|
|
|
|
|
|
GVariantIter __connection_iter, *__setting_iter; \
|
|
|
|
|
|
GVariantBuilder __connection_builder, __setting_builder; \
|
|
|
|
|
|
const char * __cur_setting_name, *__cur_property_name; \
|
|
|
|
|
|
GVariant * __property_val; \
|
|
|
|
|
|
NmtstVariantEditorPhase __phase; \
|
|
|
|
|
|
\
|
|
|
|
|
|
g_variant_builder_init(&__connection_builder, NM_VARIANT_TYPE_CONNECTION); \
|
|
|
|
|
|
g_variant_iter_init(&__connection_iter, __connection_variant); \
|
|
|
|
|
|
\
|
|
|
|
|
|
__phase = NMTST_VARIANT_EDITOR_CONNECTION; \
|
2014-09-22 09:29:41 +02:00
|
|
|
|
__cur_setting_name = NULL; \
|
|
|
|
|
|
__cur_property_name = NULL; \
|
2014-09-05 14:32:17 -04:00
|
|
|
|
__code; \
|
|
|
|
|
|
while (g_variant_iter_next(&__connection_iter, \
|
|
|
|
|
|
"{&sa{sv}}", \
|
|
|
|
|
|
&__cur_setting_name, \
|
|
|
|
|
|
&__setting_iter)) { \
|
|
|
|
|
|
g_variant_builder_init(&__setting_builder, NM_VARIANT_TYPE_SETTING); \
|
|
|
|
|
|
__phase = NMTST_VARIANT_EDITOR_SETTING; \
|
2014-09-22 09:29:41 +02:00
|
|
|
|
__cur_property_name = NULL; \
|
2014-09-05 14:32:17 -04:00
|
|
|
|
__code; \
|
|
|
|
|
|
\
|
2014-09-22 09:29:41 +02:00
|
|
|
|
while (__cur_setting_name \
|
|
|
|
|
|
&& g_variant_iter_next(__setting_iter, \
|
|
|
|
|
|
"{&sv}", \
|
|
|
|
|
|
&__cur_property_name, \
|
|
|
|
|
|
&__property_val)) { \
|
2014-09-05 14:32:17 -04:00
|
|
|
|
__phase = NMTST_VARIANT_EDITOR_PROPERTY; \
|
|
|
|
|
|
__code; \
|
|
|
|
|
|
\
|
|
|
|
|
|
if (__cur_property_name) { \
|
|
|
|
|
|
g_variant_builder_add(&__setting_builder, \
|
|
|
|
|
|
"{sv}", \
|
|
|
|
|
|
__cur_property_name, \
|
|
|
|
|
|
__property_val); \
|
2015-02-06 13:31:06 +01:00
|
|
|
|
} \
|
|
|
|
|
|
g_variant_unref(__property_val); \
|
2014-09-05 14:32:17 -04:00
|
|
|
|
} \
|
|
|
|
|
|
\
|
|
|
|
|
|
if (__cur_setting_name) \
|
|
|
|
|
|
g_variant_builder_add(&__connection_builder, \
|
|
|
|
|
|
"{sa{sv}}", \
|
|
|
|
|
|
__cur_setting_name, \
|
|
|
|
|
|
&__setting_builder); \
|
2016-03-18 19:52:48 +01:00
|
|
|
|
else \
|
|
|
|
|
|
g_variant_builder_clear(&__setting_builder); \
|
2014-09-05 14:32:17 -04:00
|
|
|
|
g_variant_iter_free(__setting_iter); \
|
|
|
|
|
|
} \
|
|
|
|
|
|
\
|
|
|
|
|
|
g_variant_unref(__connection_variant); \
|
|
|
|
|
|
\
|
|
|
|
|
|
__connection_variant = g_variant_builder_end(&__connection_builder); \
|
|
|
|
|
|
} \
|
|
|
|
|
|
G_STMT_END;
|
2020-09-28 16:03:33 +02:00
|
|
|
|
|
2014-09-05 14:32:17 -04:00
|
|
|
|
#define NMTST_VARIANT_ADD_SETTING(__setting_name, __setting_variant) \
|
|
|
|
|
|
G_STMT_START \
|
|
|
|
|
|
{ \
|
|
|
|
|
|
if (__phase == NMTST_VARIANT_EDITOR_CONNECTION) \
|
|
|
|
|
|
g_variant_builder_add(&__connection_builder, \
|
|
|
|
|
|
"{s@a{sv}}", \
|
|
|
|
|
|
__setting_name, \
|
|
|
|
|
|
__setting_variant); \
|
|
|
|
|
|
} \
|
|
|
|
|
|
G_STMT_END
|
2020-09-28 16:03:33 +02:00
|
|
|
|
|
2014-09-05 14:32:17 -04:00
|
|
|
|
#define NMTST_VARIANT_DROP_SETTING(__setting_name) \
|
|
|
|
|
|
G_STMT_START \
|
|
|
|
|
|
{ \
|
2014-10-21 08:16:25 -04:00
|
|
|
|
if (__phase == NMTST_VARIANT_EDITOR_SETTING && __cur_setting_name) { \
|
2014-09-05 14:32:17 -04:00
|
|
|
|
if (!strcmp(__cur_setting_name, __setting_name)) \
|
|
|
|
|
|
__cur_setting_name = NULL; \
|
2020-09-28 16:03:33 +02:00
|
|
|
|
} \
|
2014-09-05 14:32:17 -04:00
|
|
|
|
} \
|
|
|
|
|
|
G_STMT_END
|
2020-09-28 16:03:33 +02:00
|
|
|
|
|
2014-09-05 14:32:17 -04:00
|
|
|
|
#define NMTST_VARIANT_ADD_PROPERTY(__setting_name, __property_name, __format_string, __value) \
|
|
|
|
|
|
G_STMT_START \
|
|
|
|
|
|
{ \
|
|
|
|
|
|
if (__phase == NMTST_VARIANT_EDITOR_SETTING) { \
|
|
|
|
|
|
if (!strcmp(__cur_setting_name, __setting_name)) { \
|
|
|
|
|
|
g_variant_builder_add(&__setting_builder, \
|
|
|
|
|
|
"{sv}", \
|
|
|
|
|
|
__property_name, \
|
|
|
|
|
|
g_variant_new(__format_string, __value)); \
|
2020-09-28 16:03:33 +02:00
|
|
|
|
} \
|
|
|
|
|
|
} \
|
2014-09-05 14:32:17 -04:00
|
|
|
|
} \
|
|
|
|
|
|
G_STMT_END
|
2020-09-28 16:03:33 +02:00
|
|
|
|
|
2014-09-05 14:32:17 -04:00
|
|
|
|
#define NMTST_VARIANT_DROP_PROPERTY(__setting_name, __property_name) \
|
|
|
|
|
|
G_STMT_START \
|
|
|
|
|
|
{ \
|
2014-10-21 08:16:25 -04:00
|
|
|
|
if (__phase == NMTST_VARIANT_EDITOR_PROPERTY && __cur_property_name) { \
|
2014-09-05 14:32:17 -04:00
|
|
|
|
if (!strcmp(__cur_setting_name, __setting_name) \
|
|
|
|
|
|
&& !strcmp(__cur_property_name, __property_name)) \
|
|
|
|
|
|
__cur_property_name = NULL; \
|
|
|
|
|
|
} \
|
|
|
|
|
|
} \
|
|
|
|
|
|
G_STMT_END
|
2020-09-28 16:03:33 +02:00
|
|
|
|
|
2014-09-05 14:32:17 -04:00
|
|
|
|
#define NMTST_VARIANT_CHANGE_PROPERTY(__setting_name, \
|
|
|
|
|
|
__property_name, \
|
|
|
|
|
|
__format_string, \
|
|
|
|
|
|
__value) \
|
|
|
|
|
|
G_STMT_START \
|
|
|
|
|
|
{ \
|
|
|
|
|
|
NMTST_VARIANT_DROP_PROPERTY(__setting_name, __property_name); \
|
|
|
|
|
|
NMTST_VARIANT_ADD_PROPERTY(__setting_name, __property_name, __format_string, __value); \
|
|
|
|
|
|
} \
|
|
|
|
|
|
G_STMT_END
|
|
|
|
|
|
|
2014-09-22 09:30:36 +02:00
|
|
|
|
#endif /* __NM_CONNECTION_H__ */
|
|
|
|
|
|
|
2019-05-14 07:46:24 +02:00
|
|
|
|
static inline GVariant *
|
|
|
|
|
|
nmtst_variant_from_string(const GVariantType *variant_type, const char *variant_str)
|
|
|
|
|
|
{
|
|
|
|
|
|
GVariant *variant;
|
|
|
|
|
|
GError * error = NULL;
|
|
|
|
|
|
|
|
|
|
|
|
g_assert(variant_type);
|
|
|
|
|
|
g_assert(variant_str);
|
|
|
|
|
|
|
|
|
|
|
|
variant = g_variant_parse(variant_type, variant_str, NULL, NULL, &error);
|
|
|
|
|
|
nmtst_assert_success(variant, error);
|
|
|
|
|
|
return variant;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2019-01-03 13:22:28 +01:00
|
|
|
|
/*****************************************************************************/
|
|
|
|
|
|
|
|
|
|
|
|
static inline void
|
|
|
|
|
|
nmtst_keyfile_assert_data(GKeyFile *kf, const char *data, gssize data_len)
|
|
|
|
|
|
{
|
2020-09-02 17:36:08 +02:00
|
|
|
|
nm_auto_unref_keyfile GKeyFile *kf2 = NULL;
|
2019-01-03 13:22:28 +01:00
|
|
|
|
gs_free_error GError *error = NULL;
|
|
|
|
|
|
gs_free char * d1 = NULL;
|
|
|
|
|
|
gs_free char * d2 = NULL;
|
|
|
|
|
|
gboolean success;
|
|
|
|
|
|
gsize d1_len;
|
|
|
|
|
|
gsize d2_len;
|
|
|
|
|
|
|
|
|
|
|
|
g_assert(kf);
|
|
|
|
|
|
g_assert(data || data_len == 0);
|
|
|
|
|
|
g_assert(data_len >= -1);
|
|
|
|
|
|
|
|
|
|
|
|
d1 = g_key_file_to_data(kf, &d1_len, &error);
|
|
|
|
|
|
nmtst_assert_success(d1, error);
|
|
|
|
|
|
|
|
|
|
|
|
if (data_len == -1) {
|
|
|
|
|
|
g_assert_cmpint(strlen(d1), ==, d1_len);
|
|
|
|
|
|
data_len = strlen(data);
|
|
|
|
|
|
g_assert_cmpstr(d1, ==, data);
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
g_assert_cmpmem(d1, d1_len, data, (gsize) data_len);
|
|
|
|
|
|
|
|
|
|
|
|
/* also check that we can re-generate the same keyfile from the data. */
|
|
|
|
|
|
|
|
|
|
|
|
kf2 = g_key_file_new();
|
|
|
|
|
|
success = g_key_file_load_from_data(kf2, d1, d1_len, G_KEY_FILE_NONE, &error);
|
|
|
|
|
|
nmtst_assert_success(success, error);
|
|
|
|
|
|
|
|
|
|
|
|
d2 = g_key_file_to_data(kf2, &d2_len, &error);
|
|
|
|
|
|
nmtst_assert_success(d2, error);
|
|
|
|
|
|
|
|
|
|
|
|
g_assert_cmpmem(d2, d2_len, d1, d1_len);
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2019-08-25 14:36:21 +02:00
|
|
|
|
static inline gssize
|
|
|
|
|
|
nmtst_keyfile_get_num_keys(GKeyFile *keyfile, const char *group_name)
|
|
|
|
|
|
{
|
|
|
|
|
|
gs_strfreev char **keys = NULL;
|
|
|
|
|
|
gs_free_error GError *error = NULL;
|
|
|
|
|
|
gsize l;
|
|
|
|
|
|
|
|
|
|
|
|
g_assert(keyfile);
|
|
|
|
|
|
g_assert(group_name);
|
|
|
|
|
|
|
|
|
|
|
|
if (!g_key_file_has_group(keyfile, group_name))
|
|
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
|
|
|
|
keys = g_key_file_get_keys(keyfile, group_name, &l, &error);
|
|
|
|
|
|
|
|
|
|
|
|
nmtst_assert_success(keys, error);
|
|
|
|
|
|
|
|
|
|
|
|
g_assert_cmpint(NM_PTRARRAY_LEN(keys), ==, l);
|
|
|
|
|
|
|
|
|
|
|
|
return l;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2019-01-03 13:22:28 +01:00
|
|
|
|
/*****************************************************************************/
|
|
|
|
|
|
|
2014-03-14 17:49:49 +01:00
|
|
|
|
#endif /* __NM_TEST_UTILS_H__ */
|