diff options
| author | Yu Watanabe <watanabe.yu+github@gmail.com> | 2022-06-10 08:38:51 +0200 |
|---|---|---|
| committer | Yu Watanabe <watanabe.yu+github@gmail.com> | 2022-06-10 11:44:21 +0200 |
| commit | 3284dd91591d3c21191cf05e90ac990835503e67 (patch) | |
| tree | a0a491479d779b48a6c153b68b5613ea40a6ea1b /src/libsystemd | |
| parent | test: always exclude devices named loop* (diff) | |
| download | systemd-3284dd91591d3c21191cf05e90ac990835503e67.tar.xz systemd-3284dd91591d3c21191cf05e90ac990835503e67.zip | |
test: exclude network interfaces
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.
Diffstat (limited to 'src/libsystemd')
| -rw-r--r-- | src/libsystemd/sd-device/test-sd-device.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/libsystemd/sd-device/test-sd-device.c b/src/libsystemd/sd-device/test-sd-device.c index 62e10ad651..ba7767ee49 100644 --- a/src/libsystemd/sd-device/test-sd-device.c +++ b/src/libsystemd/sd-device/test-sd-device.c @@ -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; |