From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Fri, 10 Jun 2022 06:38:51 +0000 (+0900)
Subject: test: exclude network interfaces
X-Git-Tag: v252-rc1~827^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F23690%2Fhead;p=thirdparty%2Fsystemd.git

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.
---

diff --git a/src/libsystemd/sd-device/test-sd-device.c b/src/libsystemd/sd-device/test-sd-device.c
index 62e10ad6512..ba7767ee493 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;