dilim/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2026-07-22 23:41:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #24639 from yuwata/test-mountpoint-util

Browse Source 
test-mountpoint-util: support running on a mount namespace with another mount on /proc
This commit is contained in:
Zbigniew Jędrzejewski-Szmek
2022-09-30 17:34:21 +02:00
committed by GitHub
parent 697f082697 b13268dc09
commit f4e5569190
1 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/test/test-mountpoint-util.c
View File

@@ -83,24 +83,36 @@ TEST(mnt_id) {
HASHMAP_FOREACH_KEY(p, k, h) {
int mnt_id = PTR_TO_INT(k), mnt_id2;
const char *q;
r = path_get_mnt_id(p, &mnt_id2);
if (r < 0) {
log_debug_errno(r, "Failed to get the mnt id of %s: %m\n", p);
log_debug_errno(r, "Failed to get the mnt id of %s: %m", p);
continue;
}
if (mnt_id == mnt_id2) {
log_debug("mnt ids of %s is %i\n", p, mnt_id);
log_debug("mnt ids of %s is %i.", p, mnt_id);
continue;
} else
log_debug("mnt ids of %s are %i, %i\n", p, mnt_id, mnt_id2);
log_debug("mnt ids of %s are %i (from /proc/self/mountinfo), %i (from path_get_mnt_id()).", p, mnt_id, mnt_id2);
/* The ids don't match? If so, then there are two mounts on the same path, let's check if
* that's really the case */
char *t = hashmap_get(h, INT_TO_PTR(mnt_id2));
log_debug("the other path for mnt id %i is %s\n", mnt_id2, t);
assert_se(path_equal(p, t));
/* The ids don't match? This can easily happen e.g. running with "unshare --mount-proc".
* See #11505. */
assert_se(q = hashmap_get(h, INT_TO_PTR(mnt_id2)));
assert_se((r = path_is_mount_point(p, NULL, 0)) >= 0);
if (r == 0) {
/* If the path is not a mount point anymore, then it must be a sub directory of
* the path corresponds to mnt_id2. */
log_debug("The path %s for mnt id %i is not a mount point.", p, mnt_id2);
assert_se(!isempty(path_startswith(p, q)));
} else {
/* If the path is still a mount point, then it must be equivalent to the path
* corresponds to mnt_id2 */
log_debug("There are multiple mounts on the same path %s.", p);
assert_se(path_equal(p, q));
}
}
}
@@ -258,7 +270,7 @@ TEST(path_is_mount_point) {
assert_se(rl1t == 0);
} else
printf("Skipping bind mount file test: %m\n");
log_info("Skipping bind mount file test");
assert_se(rm_rf(tmp_dir, REMOVE_ROOT|REMOVE_PHYSICAL) == 0);
}