shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-10-30 14:55:37 +03:00
Code

Merge pull request #22953 from yuwata/test-sd-device

Browse Source 
test: several fixlets for test-sd-device
This commit is contained in:
Luca Boccassi 2022-04-05 11:10:20 +01:00 committed by GitHub
commit 18a02561f1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 94 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -17,14 +17,18 @@
static void test_sd_device_one(sd_device *d) { static void test_sd_device_one(sd_device *d) {
_cleanup_(sd_device_unrefp) sd_device *dev = NULL; _cleanup_(sd_device_unrefp) sd_device *dev = NULL;
const char *syspath, *sysname, *subsystem = NULL, *id, *devname, *val; const char *syspath, *sysname, *subsystem = NULL, *devname, *val;
bool is_block = false; bool is_block = false;
dev_t devnum; dev_t devnum;
usec_t usec; usec_t usec;
int i, r; int ifindex, r;
assert_se(sd_device_get_syspath(d, &syspath) >= 0); assert_se(sd_device_get_syspath(d, &syspath) >= 0);
assert_se(path_startswith(syspath, "/sys")); assert_se(path_startswith(syspath, "/sys"));
assert_se(sd_device_get_sysname(d, &sysname) >= 0);
log_info("%s(%s)", __func__, syspath);
assert_se(sd_device_new_from_syspath(&dev, syspath) >= 0); assert_se(sd_device_new_from_syspath(&dev, syspath) >= 0);
assert_se(sd_device_get_syspath(dev, &val) >= 0); assert_se(sd_device_get_syspath(dev, &val) >= 0);
assert_se(streq(syspath, val)); assert_se(streq(syspath, val));
@ -35,10 +39,34 @@ static void test_sd_device_one(sd_device *d) {
assert_se(streq(syspath, val)); assert_se(streq(syspath, val));
dev = sd_device_unref(dev); dev = sd_device_unref(dev);
assert_se(sd_device_get_sysname(d, &sysname) >= 0); r = sd_device_get_ifindex(d, &ifindex);
if (r >= 0) {
assert_se(ifindex > 0);
r = sd_device_new_from_ifindex(&dev, ifindex);
if (r == -ENODEV)
log_device_warning_errno(d, r,
"Failed to create sd-device object from ifindex %i. "
"Maybe running on a non-host network namespace.", ifindex);
else {
assert_se(r >= 0);
assert_se(sd_device_get_syspath(dev, &val) >= 0);
assert_se(streq(syspath, val));
dev = sd_device_unref(dev);
}
/* This does not require the interface really exists on the network namespace.
* Hence, this should always succeed. */
assert_se(sd_device_new_from_ifname(&dev, sysname) >= 0);
assert_se(sd_device_get_syspath(dev, &val) >= 0);
assert_se(streq(syspath, val));
dev = sd_device_unref(dev);
} else
assert_se(r == -ENOENT);
r = sd_device_get_subsystem(d, &subsystem); r = sd_device_get_subsystem(d, &subsystem);
if (r >= 0) { if (r >= 0) {
const char *name; const char *name, *id;
if (streq(subsystem, "drivers")) if (streq(subsystem, "drivers"))
name = strjoina(d->driver_subsystem, ":", sysname); name = strjoina(d->driver_subsystem, ":", sysname);
@ -48,6 +76,31 @@ static void test_sd_device_one(sd_device *d) {
assert_se(sd_device_get_syspath(dev, &val) >= 0); assert_se(sd_device_get_syspath(dev, &val) >= 0);
assert_se(streq(syspath, val)); assert_se(streq(syspath, val));
dev = sd_device_unref(dev); dev = sd_device_unref(dev);
/* The device ID depends on subsystem. */
assert_se(device_get_device_id(d, &id) >= 0);
r = sd_device_new_from_device_id(&dev, id);
if (r == -ENODEV && ifindex > 0)
log_device_warning_errno(d, r,
"Failed to create sd-device object from device ID \"%s\". "
"Maybe running on a non-host network namespace.", id);
else {
assert_se(r >= 0);
assert_se(sd_device_get_syspath(dev, &val) >= 0);
assert_se(streq(syspath, val));
dev = sd_device_unref(dev);
}
/* These require udev database, and reading database requires device ID. */
r = sd_device_get_is_initialized(d);
if (r > 0) {
r = sd_device_get_usec_since_initialized(d, &usec);
assert_se((r >= 0 && usec > 0) || r == -ENODATA);
} else
assert(r == 0);
r = sd_device_get_property_value(d, "ID_NET_DRIVER", &val);
assert_se(r >= 0 || r == -ENOENT);
} else } else
assert_se(r == -ENOENT); assert_se(r == -ENOENT);
@ -101,22 +154,6 @@ static void test_sd_device_one(sd_device *d) {
} else } else
assert_se(r == -ENOENT); assert_se(r == -ENOENT);
r = sd_device_get_ifindex(d, &i);
if (r >= 0) {
assert_se(i > 0);
assert_se(sd_device_new_from_ifindex(&dev, i) >= 0);
assert_se(sd_device_get_syspath(dev, &val) >= 0);
assert_se(streq(syspath, val));
dev = sd_device_unref(dev);
assert_se(sd_device_new_from_ifname(&dev, sysname) >= 0);
assert_se(sd_device_get_syspath(dev, &val) >= 0);
assert_se(streq(syspath, val));
dev = sd_device_unref(dev);
} else
assert_se(r == -ENOENT);
assert_se(sd_device_get_devpath(d, &val) >= 0); assert_se(sd_device_get_devpath(d, &val) >= 0);
r = sd_device_get_devtype(d, &val); r = sd_device_get_devtype(d, &val);
@ -128,25 +165,8 @@ static void test_sd_device_one(sd_device *d) {
r = sd_device_get_sysnum(d, &val); r = sd_device_get_sysnum(d, &val);
assert_se(r >= 0 || r == -ENOENT); assert_se(r >= 0 || r == -ENOENT);
r = sd_device_get_is_initialized(d);
if (r > 0) {
r = sd_device_get_usec_since_initialized(d, &usec);
assert_se((r >= 0 && usec > 0) || r == -ENODATA);
} else
assert(r == 0);
r = sd_device_get_sysattr_value(d, "name_assign_type", &val); r = sd_device_get_sysattr_value(d, "name_assign_type", &val);
assert_se(r >= 0 || ERRNO_IS_PRIVILEGE(r) || IN_SET(r, -ENOENT, -EINVAL)); assert_se(r >= 0 || ERRNO_IS_PRIVILEGE(r) || IN_SET(r, -ENOENT, -EINVAL));
r = sd_device_get_property_value(d, "ID_NET_DRIVER", &val);
assert_se(r >= 0 || r == -ENOENT);
assert_se(device_get_device_id(d, &id) >= 0);
assert_se(sd_device_new_from_device_id(&dev, id) >= 0);
assert_se(sd_device_get_syspath(dev, &val) >= 0);
assert_se(streq(syspath, val));
log_info("syspath:%s subsystem:%s id:%s initialized:%s", syspath, strna(subsystem), id, yes_no(i));
} }
TEST(sd_device_enumerator_devices) { TEST(sd_device_enumerator_devices) {
@ -169,39 +189,54 @@ TEST(sd_device_enumerator_subsystems) {
test_sd_device_one(d); test_sd_device_one(d);
} }
static unsigned test_sd_device_enumerator_filter_subsystem_one(const char *subsystem, Hashmap *h) { static void test_sd_device_enumerator_filter_subsystem_one(
const char *subsystem,
Hashmap *h,
unsigned *ret_n_new_dev,
unsigned *ret_n_removed_dev) {
_cleanup_(sd_device_enumerator_unrefp) sd_device_enumerator *e = NULL; _cleanup_(sd_device_enumerator_unrefp) sd_device_enumerator *e = NULL;
sd_device *d, *t; unsigned n_new_dev = 0, n_removed_dev = 0;
unsigned n_new_dev = 0; sd_device *d;
assert_se(sd_device_enumerator_new(&e) >= 0); assert_se(sd_device_enumerator_new(&e) >= 0);
assert_se(sd_device_enumerator_add_match_subsystem(e, subsystem, true) >= 0); assert_se(sd_device_enumerator_add_match_subsystem(e, subsystem, true) >= 0);
FOREACH_DEVICE(e, d) { FOREACH_DEVICE(e, d) {
const char *syspath; const char *syspath;
sd_device *t;
assert_se(sd_device_get_syspath(d, &syspath) >= 0); assert_se(sd_device_get_syspath(d, &syspath) >= 0);
t = hashmap_remove(h, syspath); t = hashmap_remove(h, syspath);
assert_se(!sd_device_unref(t));
if (t) if (!t) {
log_debug("Removed subsystem:%s syspath:%s", subsystem, syspath);
else {
log_warning("New device found: subsystem:%s syspath:%s", subsystem, syspath); log_warning("New device found: subsystem:%s syspath:%s", subsystem, syspath);
n_new_dev++; n_new_dev++;
} }
assert_se(!sd_device_unref(t));
} }
/* Assume no device is unplugged. */ HASHMAP_FOREACH(d, h) {
assert_se(hashmap_isempty(h)); const char *syspath;
return n_new_dev; assert_se(sd_device_get_syspath(d, &syspath) >= 0);
log_warning("Device removed: subsystem:%s syspath:%s", subsystem, syspath);
n_removed_dev++;
assert_se(!sd_device_unref(d));
}
hashmap_free(h);
*ret_n_new_dev = n_new_dev;
*ret_n_removed_dev = n_removed_dev;
} }
TEST(sd_device_enumerator_filter_subsystem) { TEST(sd_device_enumerator_filter_subsystem) {
_cleanup_(sd_device_enumerator_unrefp) sd_device_enumerator *e = NULL; _cleanup_(sd_device_enumerator_unrefp) sd_device_enumerator *e = NULL;
_cleanup_(hashmap_freep) Hashmap *subsystems; _cleanup_(hashmap_freep) Hashmap *subsystems;
unsigned n_new_dev = 0; unsigned n_new_dev = 0, n_removed_dev = 0;
sd_device *d; sd_device *d;
Hashmap *h; Hashmap *h;
char *s; char *s;
@ -235,16 +270,22 @@ TEST(sd_device_enumerator_filter_subsystem) {
} }
while ((h = hashmap_steal_first_key_and_value(subsystems, (void**) &s))) { while ((h = hashmap_steal_first_key_and_value(subsystems, (void**) &s))) {
n_new_dev += test_sd_device_enumerator_filter_subsystem_one(s, h); unsigned n, m;
hashmap_free(h);
test_sd_device_enumerator_filter_subsystem_one(s, TAKE_PTR(h), &n, &m);
free(s); free(s);
n_new_dev += n;
n_removed_dev += m;
} }
if (n_new_dev > 0) if (n_new_dev > 0)
log_warning("%u new device is found in re-scan", n_new_dev); log_warning("%u new devices are found in re-scan", n_new_dev);
if (n_removed_dev > 0)
log_warning("%u devices removed in re-scan", n_removed_dev);
/* Assume that not so many devices are plugged. */ /* Assume that not so many devices are plugged or unplugged. */
assert_se(n_new_dev <= 10); assert_se(n_new_dev + n_removed_dev <= 10);
} }
TEST(sd_device_new_from_nulstr) { TEST(sd_device_new_from_nulstr) {