From 733529d81227ca713de2d6be77939e3bfedb926f Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Mon, 12 Dec 2022 15:04:02 +0900 Subject: [PATCH] test: name_assign_type sysattr never exists for enumerated devices As we filtered out network devices in the test. --- src/libsystemd/sd-device/test-sd-device.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/libsystemd/sd-device/test-sd-device.c b/src/libsystemd/sd-device/test-sd-device.c index 32ee6707013..2bb9c287889 100644 --- a/src/libsystemd/sd-device/test-sd-device.c +++ b/src/libsystemd/sd-device/test-sd-device.c @@ -180,15 +180,16 @@ static void test_sd_device_one(sd_device *d) { } else assert_se(r == -ENOENT); - r = sd_device_get_sysattr_value(d, "name_assign_type", &val); - assert_se(r >= 0 || ERRNO_IS_PRIVILEGE(r) || IN_SET(r, -ENOENT, -EINVAL)); - - if (r > 0) { + r = sd_device_get_sysattr_value(d, "nsid", NULL); + if (r >= 0) { unsigned x; - assert_se(device_get_sysattr_unsigned(d, "name_assign_type", NULL) >= 0); - assert_se(device_get_sysattr_unsigned(d, "name_assign_type", &x) >= 0); - } + assert_se(device_get_sysattr_unsigned(d, "nsid", NULL) >= 0); + r = device_get_sysattr_unsigned(d, "nsid", &x); + assert_se(r >= 0); + assert_se((x > 0) == (r > 0)); + } else + assert_se(ERRNO_IS_PRIVILEGE(r) || IN_SET(r, -ENOENT, -EINVAL)); } TEST(sd_device_enumerator_devices) { -- 2.47.3