SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #29407 from CM4all/test-kernel-acl-dummy

Browse Source 
src/test: fixups for kernels without ACL and net-dummy
This commit is contained in:
Luca Boccassi
2023-10-02 16:30:39 +01:00
committed by GitHub
parent df3e378a5d 8a87a16bbb
commit fdb0b47bf7
2 changed files with 24 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/test/test-chown-rec.c
+6 -1
View File
@@ -44,6 +44,7 @@ TEST(chown_recursive) {
const char *p;
const uid_t uid = getuid();
const gid_t gid = getgid();
int r;
umask(022);
assert_se(mkdtemp_malloc(NULL, &t) >= 0);
@@ -95,7 +96,11 @@ TEST(chown_recursive) {
/* We now apply an xattr to the dir, and check it again */
p = strjoina(t, "/dir");
assert_se(setxattr(p, "system.posix_acl_access", acl, sizeof(acl), 0) >= 0);
r = RET_NERRNO(setxattr(p, "system.posix_acl_access", acl, sizeof(acl), 0));
if (ERRNO_IS_NEG_NOT_SUPPORTED(r))
return (void) log_tests_skipped_errno(r, "no acl supported on /tmp");
assert_se(r >= 0);
assert_se(setxattr(p, "system.posix_acl_default", default_acl, sizeof(default_acl), 0) >= 0);
assert_se(lstat(p, &st) >= 0);
assert_se(S_ISDIR(st.st_mode));
src/test/test-execute.c
+18 -6
View File
@@ -38,6 +38,7 @@
static char *user_runtime_unit_dir = NULL;
static bool can_unshare;
static bool have_net_dummy;
static unsigned n_ran_tests = 0;
STATIC_DESTRUCTOR_REGISTER(user_runtime_unit_dir, freep);
@@ -1074,6 +1075,9 @@ static void test_exec_ambientcapabilities(Manager *m) {
static void test_exec_privatenetwork(Manager *m) {
int r;
if (!have_net_dummy)
return (void)log_notice("Skipping %s, dummy network interface not available", __func__);
r = find_executable("ip", NULL);
if (r < 0) {
log_notice_errno(r, "Skipping %s, could not find ip binary: %m", __func__);
@@ -1087,6 +1091,9 @@ static void test_exec_privatenetwork(Manager *m) {
static void test_exec_networknamespacepath(Manager *m) {
int r;
if (!have_net_dummy)
return (void)log_notice("Skipping %s, dummy network interface not available", __func__);
r = find_executable("ip", NULL);
if (r < 0) {
log_notice_errno(r, "Skipping %s, could not find ip binary: %m", __func__);
@@ -1424,18 +1431,23 @@ static int intro(void) {
return log_tests_skipped("/sys is mounted read-only");
/* Create dummy network interface for testing PrivateNetwork=yes */
(void) system("ip link add dummy-test-exec type dummy");
have_net_dummy = system("ip link add dummy-test-exec type dummy") == 0;
/* Create a network namespace and a dummy interface in it for NetworkNamespacePath= */
(void) system("ip netns add test-execute-netns");
(void) system("ip netns exec test-execute-netns ip link add dummy-test-ns type dummy");
if (have_net_dummy) {
/* Create a network namespace and a dummy interface in it for NetworkNamespacePath= */
(void) system("ip netns add test-execute-netns");
(void) system("ip netns exec test-execute-netns ip link add dummy-test-ns type dummy");
}
return EXIT_SUCCESS;
}
static int outro(void) {
(void) system("ip link del dummy-test-exec");
(void) system("ip netns del test-execute-netns");
if (have_net_dummy) {
(void) system("ip link del dummy-test-exec");
(void) system("ip netns del test-execute-netns");
}
(void) rmdir(PRIVATE_UNIT_DIR);
return EXIT_SUCCESS;