picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #10462 from yuwata/test-sd-device-monitor 

Add tests for sd_device_monitor and small cleanups
This commit is contained in:
Lennart Poettering 2018-10-19 22:05:50 +02:00 committed by GitHub
parent 490c5a37cb aaa5b4cec7
commit 347a19343c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 138 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/libsystemd/sd-device/device-monitor.c
View File

@ -525,7 +525,7 @@ int device_monitor_send_device(
return log_debug_errno(r, "Failed to get device subsystem: %m");
nlh.filter_subsystem_hash = htobe32(string_hash32(val));
if (sd_device_get_devtype(device, &val) >= 0 && val)
if (sd_device_get_devtype(device, &val) >= 0)
nlh.filter_devtype_hash = htobe32(string_hash32(val));
/* add tag bloom filter */
@ -560,7 +560,7 @@ int device_monitor_send_device(
log_debug("Passed device to netlink monitor");
return 0;
} else
return log_debug_errno(errno, "Failed to send device to netlink monitor");
return log_debug_errno(errno, "Failed to send device to netlink monitor: %m");
}
log_debug("Passed %zi byte device to netlink monitor", count);

131
src/libsystemd/sd-device/test-sd-device-monitor.c Normal file
View File

@ -0,0 +1,131 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
#include <stdbool.h>
#include <unistd.h>
#include "sd-device.h"
#include "sd-event.h"
#include "device-monitor-private.h"
#include "device-private.h"
#include "device-util.h"
#include "macro.h"
#include "string-util.h"
#include "tests.h"
#include "util.h"
#include "virt.h"
static int monitor_handler(sd_device_monitor *m, sd_device *d, void *userdata) {
const char *s, *syspath = userdata;
assert_se(sd_device_get_syspath(d, &s) >= 0);
assert_se(streq(s, syspath));
return sd_event_exit(sd_device_monitor_get_event(m), 0);
}
static int test_loopback(bool subsystem_filter, bool tag_filter, bool use_bpf) {
_cleanup_(sd_device_monitor_unrefp) sd_device_monitor *monitor_server = NULL, *monitor_client = NULL;
_cleanup_(sd_device_unrefp) sd_device *loopback = NULL;
const char *syspath, *subsystem, *tag;
int r;
log_info("/* %s(subsystem_filter=%s, tag_filter=%s, use_bpf=%s) */", __func__,
true_false(subsystem_filter), true_false(tag_filter), true_false(use_bpf));
assert_se(sd_device_new_from_syspath(&loopback, "/sys/class/net/lo") >= 0);
assert_se(sd_device_get_syspath(loopback, &syspath) >= 0);
assert_se(device_add_property(loopback, "ACTION", "add") >= 0);
assert_se(device_add_property(loopback, "SEQNUM", "10") >= 0);
assert_se(device_monitor_new_full(&monitor_server, MONITOR_GROUP_NONE, -1) >= 0);
assert_se(sd_device_monitor_start(monitor_server, NULL, NULL, NULL) >= 0);
assert_se(device_monitor_new_full(&monitor_client, MONITOR_GROUP_NONE, -1) >= 0);
assert_se(device_monitor_allow_unicast_sender(monitor_client, monitor_server) >= 0);
assert_se(sd_device_monitor_start(monitor_client, monitor_handler, (void *) syspath, "loopback-monitor") >= 0);
if (subsystem_filter) {
assert_se(sd_device_get_subsystem(loopback, &subsystem) >= 0);
assert_se(sd_device_monitor_filter_add_match_subsystem_devtype(monitor_client, subsystem, NULL) >= 0);
}
if (tag_filter)
FOREACH_DEVICE_TAG(loopback, tag)
assert_se(sd_device_monitor_filter_add_match_tag(monitor_client, tag) >= 0);
if ((subsystem_filter || tag_filter) && use_bpf)
assert_se(sd_device_monitor_filter_update(monitor_client) >= 0);
r = device_monitor_send_device(monitor_server, monitor_client, loopback);
if (r < 0)
return log_error_errno(r, "Failed to send loopback device: %m");
assert_se(sd_event_loop(sd_device_monitor_get_event(monitor_client)) == 0);
return 0;
}
static void test_subsystem_filter(void) {
_cleanup_(sd_device_monitor_unrefp) sd_device_monitor *monitor_server = NULL, *monitor_client = NULL;
_cleanup_(sd_device_enumerator_unrefp) sd_device_enumerator *e = NULL;
_cleanup_(sd_device_unrefp) sd_device *loopback = NULL;
const char *syspath, *subsystem, *p, *s;
sd_device *d;
log_info("/* %s */", __func__);
assert_se(sd_device_new_from_syspath(&loopback, "/sys/class/net/lo") >= 0);
assert_se(sd_device_get_syspath(loopback, &syspath) >= 0);
assert_se(sd_device_get_subsystem(loopback, &subsystem) >= 0);
assert_se(device_add_property(loopback, "ACTION", "add") >= 0);
assert_se(device_add_property(loopback, "SEQNUM", "10") >= 0);
assert_se(device_monitor_new_full(&monitor_server, MONITOR_GROUP_NONE, -1) >= 0);
assert_se(sd_device_monitor_start(monitor_server, NULL, NULL, NULL) >= 0);
assert_se(device_monitor_new_full(&monitor_client, MONITOR_GROUP_NONE, -1) >= 0);
assert_se(device_monitor_allow_unicast_sender(monitor_client, monitor_server) >= 0);
assert_se(sd_device_monitor_filter_add_match_subsystem_devtype(monitor_client, subsystem, NULL) >= 0);
assert_se(sd_device_monitor_start(monitor_client, monitor_handler, (void *) syspath, "subsystem-filter") >= 0);
assert_se(sd_device_enumerator_new(&e) >= 0);
assert_se(sd_device_enumerator_add_match_subsystem(e, subsystem, false) >= 0);
FOREACH_DEVICE(e, d) {
assert_se(sd_device_get_syspath(d, &p) >= 0);
assert_se(sd_device_get_subsystem(d, &s) >= 0);
log_info("Sending device subsystem:%s syspath:%s", s, p);
assert_se(device_monitor_send_device(monitor_server, monitor_client, d) >= 0);
}
log_info("Sending device subsystem:%s syspath:%s", subsystem, syspath);
assert_se(device_monitor_send_device(monitor_server, monitor_client, loopback) >= 0);
assert_se(sd_event_loop(sd_device_monitor_get_event(monitor_client)) == 0);
}
int main(int argc, char *argv[]) {
int r;
test_setup_logging(LOG_INFO);
if (getuid() != 0)
return log_tests_skipped("not root");
r = test_loopback(false, false, false);
if (r < 0) {
assert_se(r == -EPERM && detect_container() > 0);
return log_tests_skipped("Running in container? Skipping remaining tests");
}
assert_se(test_loopback( true, false, false) >= 0);
assert_se(test_loopback(false, true, false) >= 0);
assert_se(test_loopback( true, true, false) >= 0);
assert_se(test_loopback( true, false, true) >= 0);
assert_se(test_loopback(false, true, true) >= 0);
assert_se(test_loopback( true, true, true) >= 0);
test_subsystem_filter();
return 0;
}

5
src/test/meson.build
View File

@ -909,6 +909,11 @@ tests += [
libshared_static,
libudev],
[threads]],
[['src/libsystemd/sd-device/test-sd-device-monitor.c'],
[],
[]],
]
if cxx.found()