dilim/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2026-08-04 23:20:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Some cleanups and a CI fix for test-sd-device (#37083)

Browse Source
This commit is contained in:
Luca Boccassi
2025-04-10 14:47:02 +01:00
committed by GitHub
parent 3d115fb6c8 74cb65e45f
commit dd85fbf6aa
1 changed files with 25 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -221,11 +221,7 @@ static void test_sd_device_one(sd_device *d) {
}
}
TEST(sd_device_enumerator_devices) {
_cleanup_(sd_device_enumerator_unrefp) sd_device_enumerator *e = NULL;
ASSERT_OK(sd_device_enumerator_new(&e));
ASSERT_OK(sd_device_enumerator_allow_uninitialized(e));
static void exclude_problematic_devices(sd_device_enumerator *e) {
/* On some CI environments, it seems some loop block devices and corresponding bdi devices sometimes
* disappear during running this test. Let's exclude them here for stability. */
ASSERT_OK(sd_device_enumerator_add_match_subsystem(e, "bdi", false));
@@ -233,6 +229,15 @@ TEST(sd_device_enumerator_devices) {
/* 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_OK(sd_device_enumerator_add_match_subsystem(e, "net", false));
}
TEST(sd_device_enumerator_devices) {
_cleanup_(sd_device_enumerator_unrefp) sd_device_enumerator *e = NULL;
ASSERT_OK(sd_device_enumerator_new(&e));
ASSERT_OK(sd_device_enumerator_allow_uninitialized(e));
exclude_problematic_devices(e);
FOREACH_DEVICE(e, d)
test_sd_device_one(d);
}
@@ -300,10 +305,7 @@ static bool test_sd_device_enumerator_filter_subsystem_trial(void) {
ASSERT_NOT_NULL((subsystems = hashmap_new(&string_hash_ops)));
ASSERT_OK(sd_device_enumerator_new(&e));
/* See comments in TEST(sd_device_enumerator_devices). */
ASSERT_OK(sd_device_enumerator_add_match_subsystem(e, "bdi", false));
ASSERT_OK(sd_device_enumerator_add_nomatch_sysname(e, "loop*"));
ASSERT_OK(sd_device_enumerator_add_match_subsystem(e, "net", false));
exclude_problematic_devices(e);
FOREACH_DEVICE(e, d) {
const char *syspath, *subsystem;
@@ -478,14 +480,15 @@ static void check_parent_match(sd_device_enumerator *e, sd_device *dev) {
TEST(sd_device_enumerator_add_match_parent) {
_cleanup_(sd_device_enumerator_unrefp) sd_device_enumerator *e = NULL;
/* Some devices have thousands of children. Avoid spending too much time in the double loop below. */
unsigned iterations = 200;
int r;
ASSERT_OK(sd_device_enumerator_new(&e));
ASSERT_OK(sd_device_enumerator_allow_uninitialized(e));
/* See comments in TEST(sd_device_enumerator_devices). */
ASSERT_OK(sd_device_enumerator_add_match_subsystem(e, "bdi", false));
ASSERT_OK(sd_device_enumerator_add_nomatch_sysname(e, "loop*"));
ASSERT_OK(sd_device_enumerator_add_match_subsystem(e, "net", false));
exclude_problematic_devices(e);
ASSERT_OK(sd_device_enumerator_add_match_subsystem(e, "memory", false));
if (!slow_tests_enabled())
ASSERT_OK(sd_device_enumerator_add_match_subsystem(e, "block", true));
@@ -495,6 +498,9 @@ TEST(sd_device_enumerator_add_match_parent) {
const char *syspath;
sd_device *parent;
if (iterations-- == 0)
break;
ASSERT_OK(sd_device_get_syspath(dev, &syspath));
r = sd_device_get_parent(dev, &parent);
@@ -560,14 +566,13 @@ TEST(sd_device_enumerator_add_all_parents) {
TEST(sd_device_get_child) {
_cleanup_(sd_device_enumerator_unrefp) sd_device_enumerator *e = NULL;
/* Some devices have thousands of children. Avoid spending too much time in the double loop below. */
unsigned iterations = 3000;
int r;
ASSERT_OK(sd_device_enumerator_new(&e));
ASSERT_OK(sd_device_enumerator_allow_uninitialized(e));
/* See comments in TEST(sd_device_enumerator_devices). */
ASSERT_OK(sd_device_enumerator_add_match_subsystem(e, "bdi", false));
ASSERT_OK(sd_device_enumerator_add_nomatch_sysname(e, "loop*"));
ASSERT_OK(sd_device_enumerator_add_match_subsystem(e, "net", false));
exclude_problematic_devices(e);
if (!slow_tests_enabled())
ASSERT_OK(sd_device_enumerator_add_match_subsystem(e, "block", true));
@@ -593,6 +598,9 @@ TEST(sd_device_get_child) {
FOREACH_DEVICE_CHILD_WITH_SUFFIX(parent, child, suffix) {
const char *s;
if (iterations-- == 0)
return;
ASSERT_NOT_NULL(child);
ASSERT_NOT_NULL(suffix);