shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-01-25 06:03:40 +03:00
Code

test: exclude network interfaces

Browse Source 
After https://github.com/systemd/systemd-centos-ci/pull/492 is merged,
the networkd test may be running when test-sd-device is invoked.
Let's exclude net subsystem.
This commit is contained in:
Yu Watanabe 2022-06-10 15:38:51 +09:00
parent f9e090b16d
commit 3284dd9159
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -189,6 +189,9 @@ TEST(sd_device_enumerator_devices) {
* disappear during running this test. Let's exclude them here for stability. */
assert_se(sd_device_enumerator_add_match_subsystem(e, "bdi", false) >= 0);
assert_se(sd_device_enumerator_add_nomatch_sysname(e, "loop*") >= 0);
/* On CentOS CI, systemd-networkd-tests.py may be running when this test is invoked. The networkd
* test creates and removes many network interfaces, and may interfere with this test. */
assert_se(sd_device_enumerator_add_match_subsystem(e, "net", false) >= 0);
FOREACH_DEVICE(e, d)
test_sd_device_one(d);
}
@ -261,6 +264,7 @@ TEST(sd_device_enumerator_filter_subsystem) {
/* See comments in TEST(sd_device_enumerator_devices). */
assert_se(sd_device_enumerator_add_match_subsystem(e, "bdi", false) >= 0);
assert_se(sd_device_enumerator_add_nomatch_sysname(e, "loop*") >= 0);
assert_se(sd_device_enumerator_add_match_subsystem(e, "net", false) >= 0);
FOREACH_DEVICE(e, d) {
const char *syspath, *subsystem;