xsprintf(path, "/proc/"PID_FMT"/comm", pid);
if (stat(path, &st) == 0) {
- assert_se(pid_get_comm(pid, &a) >= 0);
+ ASSERT_OK(pid_get_comm(pid, &a));
log_info("PID"PID_FMT" comm: '%s'", pid, a);
} else
log_warning("%s not exist.", path);
- assert_se(pid_get_cmdline(pid, 0, PROCESS_CMDLINE_COMM_FALLBACK, &c) >= 0);
+ ASSERT_OK(pid_get_cmdline(pid, 0, PROCESS_CMDLINE_COMM_FALLBACK, &c));
log_info("PID"PID_FMT" cmdline: '%s'", pid, c);
- assert_se(pid_get_cmdline(pid, 8, 0, &d) >= 0);
+ ASSERT_OK(pid_get_cmdline(pid, 8, 0, &d));
log_info("PID"PID_FMT" cmdline truncated to 8: '%s'", pid, d);
free(d);
- assert_se(pid_get_cmdline(pid, 1, 0, &d) >= 0);
+ ASSERT_OK(pid_get_cmdline(pid, 1, 0, &d));
log_info("PID"PID_FMT" cmdline truncated to 1: '%s'", pid, d);
r = get_process_ppid(pid, &e);
- assert_se(pid == 1 ? r == -EADDRNOTAVAIL : r >= 0);
+ if (pid == 1)
+ ASSERT_ERROR(r, EADDRNOTAVAIL);
+ else
+ ASSERT_OK(r);
if (r >= 0) {
log_info("PID"PID_FMT" PPID: "PID_FMT, pid, e);
- assert_se(e > 0);
+ ASSERT_GT(e, 0);
}
- assert_se(pid_is_kernel_thread(pid) == 0 || pid != 1);
+ ASSERT_TRUE(pid_is_kernel_thread(pid) == 0 || pid != 1);
r = get_process_exe(pid, &f);
- assert_se(r >= 0 || r == -EACCES);
+ if (r != -EACCES)
+ ASSERT_OK(r);
log_info("PID"PID_FMT" exe: '%s'", pid, strna(f));
- assert_se(pid_get_uid(pid, &u) == 0);
+ ASSERT_OK_ZERO(pid_get_uid(pid, &u));
log_info("PID"PID_FMT" UID: "UID_FMT, pid, u);
- assert_se(get_process_gid(pid, &g) == 0);
+ ASSERT_OK_ZERO(get_process_gid(pid, &g));
log_info("PID"PID_FMT" GID: "GID_FMT, pid, g);
r = get_process_environ(pid, &env);
- assert_se(r >= 0 || r == -EACCES);
+ if (r != -EACCES)
+ ASSERT_OK(r);
log_info("PID"PID_FMT" strlen(environ): %zi", pid, env ? (ssize_t)strlen(env) : (ssize_t)-errno);
- if (!detect_container())
- assert_se(get_ctty_devnr(pid, &h) == -ENXIO || pid != 1);
+ if (!detect_container() && pid == 1)
+ ASSERT_ERROR(get_ctty_devnr(pid, &h), ENXIO);
(void) getenv_for_pid(pid, "PATH", &i);
log_info("PID"PID_FMT" $PATH: '%s'", pid, strna(i));
r = pid_get_cmdline_strv(pid, 0, &strv_a);
if (r >= 0)
- assert_se(joined = strv_join(strv_a, "\", \""));
+ ASSERT_NOT_NULL(joined = strv_join(strv_a, "\", \""));
log_info(" \"%s\"", r >= 0 ? joined : errno_to_name(r));
joined = mfree(joined);
r = pid_get_cmdline_strv(pid, PROCESS_CMDLINE_COMM_FALLBACK, &strv_b);
if (r >= 0)
- assert_se(joined = strv_join(strv_b, "\", \""));
+ ASSERT_NOT_NULL(joined = strv_join(strv_b, "\", \""));
log_info(" \"%s\"", r >= 0 ? joined : errno_to_name(r));
}
_cleanup_closedir_ DIR *d = NULL;
int r;
- assert_se(proc_dir_open(&d) >= 0);
+ ASSERT_OK(proc_dir_open(&d));
for (;;) {
pid_t pid;
r = proc_dir_read(d, &pid);
- assert_se(r >= 0);
+ ASSERT_OK(r);
if (r == 0) /* EOF */
break;
log_debug("input: <%s> — output: <%s>", input, output);
- assert_se(prctl(PR_SET_NAME, input) >= 0);
- assert_se(pid_get_comm(0, &n) >= 0);
+ ASSERT_OK_ERRNO(prctl(PR_SET_NAME, input));
+ ASSERT_OK(pid_get_comm(0, &n));
log_debug("got: <%s>", n);
TEST(pid_get_comm_escape) {
_cleanup_free_ char *saved = NULL;
- assert_se(pid_get_comm(0, &saved) >= 0);
+ ASSERT_OK(pid_get_comm(0, &saved));
test_pid_get_comm_escape_one("", "");
test_pid_get_comm_escape_one("foo", "foo");
test_pid_get_comm_escape_one("xxxxäöüß", "xxxx\\303\\244\\303\\266\\303\\274\\303\\237");
test_pid_get_comm_escape_one("xxxxxäöüß", "xxxxx\\303\\244\\303\\266\\303\\274\\303\\237");
- assert_se(prctl(PR_SET_NAME, saved) >= 0);
+ ASSERT_OK_ERRNO(prctl(PR_SET_NAME, saved));
}
TEST(pid_is_unwaited) {
pid_t pid;
pid = fork();
- assert_se(pid >= 0);
+ ASSERT_OK_ERRNO(pid);
if (pid == 0) {
_exit(EXIT_SUCCESS);
} else {
int status;
- assert_se(waitpid(pid, &status, 0) == pid);
- assert_se(pid_is_unwaited(pid) == 0);
+ ASSERT_OK_EQ_ERRNO(waitpid(pid, &status, 0), pid);
+ ASSERT_OK_ZERO(pid_is_unwaited(pid));
}
- assert_se(pid_is_unwaited(getpid_cached()) > 0);
- assert_se(pid_is_unwaited(-1) < 0);
+ ASSERT_OK_POSITIVE(pid_is_unwaited(getpid_cached()));
+ ASSERT_FAIL(pid_is_unwaited(-1));
}
TEST(pid_is_alive) {
pid_t pid;
pid = fork();
- assert_se(pid >= 0);
+ ASSERT_OK_ERRNO(pid);
if (pid == 0) {
_exit(EXIT_SUCCESS);
} else {
int status;
- assert_se(waitpid(pid, &status, 0) == pid);
- assert_se(pid_is_alive(pid) == 0);
+ ASSERT_OK_EQ_ERRNO(waitpid(pid, &status, 0), pid);
+ ASSERT_OK_ZERO(pid_is_alive(pid));
}
- assert_se(pid_is_alive(getpid_cached()) > 0);
- assert_se(pid_is_alive(-1) < 0);
+ ASSERT_OK_POSITIVE(pid_is_alive(getpid_cached()));
+ ASSERT_FAIL(pid_is_alive(-1));
}
TEST(personality) {
- assert_se(personality_to_string(PER_LINUX));
- assert_se(!personality_to_string(PERSONALITY_INVALID));
+ ASSERT_NOT_NULL(personality_to_string(PER_LINUX));
+ ASSERT_NULL(personality_to_string(PERSONALITY_INVALID));
ASSERT_STREQ(personality_to_string(PER_LINUX), architecture_to_string(native_architecture()));
- assert_se(personality_from_string(personality_to_string(PER_LINUX)) == PER_LINUX);
- assert_se(personality_from_string(architecture_to_string(native_architecture())) == PER_LINUX);
+ ASSERT_EQ(personality_from_string(personality_to_string(PER_LINUX)), (unsigned long) PER_LINUX);
+ ASSERT_EQ(personality_from_string(architecture_to_string(native_architecture())), (unsigned long) PER_LINUX);
#ifdef __x86_64__
ASSERT_STREQ(personality_to_string(PER_LINUX), "x86-64");
ASSERT_STREQ(personality_to_string(PER_LINUX32), "x86");
- assert_se(personality_from_string("x86-64") == PER_LINUX);
- assert_se(personality_from_string("x86") == PER_LINUX32);
- assert_se(personality_from_string("ia64") == PERSONALITY_INVALID);
- assert_se(personality_from_string(NULL) == PERSONALITY_INVALID);
+ ASSERT_EQ(personality_from_string("x86-64"), (unsigned long) PER_LINUX);
+ ASSERT_EQ(personality_from_string("x86"), (unsigned long) PER_LINUX32);
+ ASSERT_EQ(personality_from_string("ia64"), PERSONALITY_INVALID);
+ ASSERT_EQ(personality_from_string(NULL), PERSONALITY_INVALID);
- assert_se(personality_from_string(personality_to_string(PER_LINUX32)) == PER_LINUX32);
+ ASSERT_EQ(personality_from_string(personality_to_string(PER_LINUX32)), (unsigned long) PER_LINUX32);
#endif
}
(void) wait_for_terminate(pid, &si);
- assert_se(si.si_code == CLD_EXITED);
- assert_se(si.si_status == 0);
+ ASSERT_EQ(si.si_code, CLD_EXITED);
+ ASSERT_OK_ZERO(si.si_status);
return;
}
- assert_se(pid == 0);
+ ASSERT_OK_ZERO(pid);
r = detach_mount_namespace();
if (r < 0) {
log_warning_errno(r, "detach mount namespace failed: %m");
- assert_se(ERRNO_IS_PRIVILEGE(r));
+ if (!ERRNO_IS_PRIVILEGE(r))
+ ASSERT_OK(r);
return;
}
fd = mkostemp(path, O_CLOEXEC);
- assert_se(fd >= 0);
+ ASSERT_OK_ERRNO(fd);
/* Note that we don't unmount the following bind-mount at the end of the test because the kernel
* will clear up its /proc/PID/ hierarchy automatically as soon as the test stops. */
if (mount(path, "/proc/self/cmdline", "bind", MS_BIND, NULL) < 0) {
/* This happens under selinux… Abort the test in this case. */
log_warning_errno(errno, "mount(..., \"/proc/self/cmdline\", \"bind\", ...) failed: %m");
- assert_se(IN_SET(errno, EPERM, EACCES));
+ ASSERT_TRUE(IN_SET(errno, EPERM, EACCES));
return;
}
if (setrlimit(RLIMIT_STACK, &RLIMIT_MAKE_CONST(RLIM_INFINITY)) < 0)
log_warning("Testing without RLIMIT_STACK=infinity");
- assert_se(unlink(path) >= 0);
+ ASSERT_OK_ERRNO(unlink(path));
- assert_se(prctl(PR_SET_NAME, "testa") >= 0);
+ ASSERT_OK_ERRNO(prctl(PR_SET_NAME, "testa"));
- assert_se(pid_get_cmdline(0, SIZE_MAX, 0, &line) == -ENOENT);
+ ASSERT_ERROR(pid_get_cmdline(0, SIZE_MAX, 0, &line), ENOENT);
- assert_se(pid_get_cmdline(0, SIZE_MAX, PROCESS_CMDLINE_COMM_FALLBACK, &line) >= 0);
+ ASSERT_OK(pid_get_cmdline(0, SIZE_MAX, PROCESS_CMDLINE_COMM_FALLBACK, &line));
log_debug("'%s'", line);
ASSERT_STREQ(line, "[testa]");
line = mfree(line);
- assert_se(pid_get_cmdline(0, SIZE_MAX, PROCESS_CMDLINE_COMM_FALLBACK | PROCESS_CMDLINE_QUOTE, &line) >= 0);
+ ASSERT_OK(pid_get_cmdline(0, SIZE_MAX, PROCESS_CMDLINE_COMM_FALLBACK | PROCESS_CMDLINE_QUOTE, &line));
log_debug("'%s'", line);
ASSERT_STREQ(line, "\"[testa]\""); /* quoting is enabled here */
line = mfree(line);
- assert_se(pid_get_cmdline(0, 0, PROCESS_CMDLINE_COMM_FALLBACK, &line) >= 0);
+ ASSERT_OK(pid_get_cmdline(0, 0, PROCESS_CMDLINE_COMM_FALLBACK, &line));
log_debug("'%s'", line);
ASSERT_STREQ(line, "");
line = mfree(line);
- assert_se(pid_get_cmdline(0, 1, PROCESS_CMDLINE_COMM_FALLBACK, &line) >= 0);
+ ASSERT_OK(pid_get_cmdline(0, 1, PROCESS_CMDLINE_COMM_FALLBACK, &line));
ASSERT_STREQ(line, "…");
line = mfree(line);
- assert_se(pid_get_cmdline(0, 2, PROCESS_CMDLINE_COMM_FALLBACK, &line) >= 0);
+ ASSERT_OK(pid_get_cmdline(0, 2, PROCESS_CMDLINE_COMM_FALLBACK, &line));
ASSERT_STREQ(line, "[…");
line = mfree(line);
- assert_se(pid_get_cmdline(0, 3, PROCESS_CMDLINE_COMM_FALLBACK, &line) >= 0);
+ ASSERT_OK(pid_get_cmdline(0, 3, PROCESS_CMDLINE_COMM_FALLBACK, &line));
ASSERT_STREQ(line, "[t…");
line = mfree(line);
- assert_se(pid_get_cmdline(0, 4, PROCESS_CMDLINE_COMM_FALLBACK, &line) >= 0);
+ ASSERT_OK(pid_get_cmdline(0, 4, PROCESS_CMDLINE_COMM_FALLBACK, &line));
ASSERT_STREQ(line, "[te…");
line = mfree(line);
- assert_se(pid_get_cmdline(0, 5, PROCESS_CMDLINE_COMM_FALLBACK, &line) >= 0);
+ ASSERT_OK(pid_get_cmdline(0, 5, PROCESS_CMDLINE_COMM_FALLBACK, &line));
ASSERT_STREQ(line, "[tes…");
line = mfree(line);
- assert_se(pid_get_cmdline(0, 6, PROCESS_CMDLINE_COMM_FALLBACK, &line) >= 0);
+ ASSERT_OK(pid_get_cmdline(0, 6, PROCESS_CMDLINE_COMM_FALLBACK, &line));
ASSERT_STREQ(line, "[test…");
line = mfree(line);
- assert_se(pid_get_cmdline(0, 7, PROCESS_CMDLINE_COMM_FALLBACK, &line) >= 0);
+ ASSERT_OK(pid_get_cmdline(0, 7, PROCESS_CMDLINE_COMM_FALLBACK, &line));
ASSERT_STREQ(line, "[testa]");
line = mfree(line);
- assert_se(pid_get_cmdline(0, 8, PROCESS_CMDLINE_COMM_FALLBACK, &line) >= 0);
+ ASSERT_OK(pid_get_cmdline(0, 8, PROCESS_CMDLINE_COMM_FALLBACK, &line));
ASSERT_STREQ(line, "[testa]");
line = mfree(line);
- assert_se(pid_get_cmdline_strv(0, PROCESS_CMDLINE_COMM_FALLBACK, &args) >= 0);
- assert_se(strv_equal(args, STRV_MAKE("[testa]")));
+ ASSERT_OK(pid_get_cmdline_strv(0, PROCESS_CMDLINE_COMM_FALLBACK, &args));
+ ASSERT_TRUE(strv_equal(args, STRV_MAKE("[testa]")));
args = strv_free(args);
/* Test with multiple arguments that don't require quoting */
- assert_se(write(fd, "foo\0bar", 8) == 8);
+ ASSERT_OK_EQ_ERRNO(write(fd, "foo\0bar", 8), 8);
- assert_se(pid_get_cmdline(0, SIZE_MAX, 0, &line) >= 0);
+ ASSERT_OK(pid_get_cmdline(0, SIZE_MAX, 0, &line));
log_debug("'%s'", line);
ASSERT_STREQ(line, "foo bar");
line = mfree(line);
- assert_se(pid_get_cmdline(0, SIZE_MAX, PROCESS_CMDLINE_COMM_FALLBACK, &line) >= 0);
+ ASSERT_OK(pid_get_cmdline(0, SIZE_MAX, PROCESS_CMDLINE_COMM_FALLBACK, &line));
ASSERT_STREQ(line, "foo bar");
line = mfree(line);
- assert_se(pid_get_cmdline_strv(0, PROCESS_CMDLINE_COMM_FALLBACK, &args) >= 0);
- assert_se(strv_equal(args, STRV_MAKE("foo", "bar")));
+ ASSERT_OK(pid_get_cmdline_strv(0, PROCESS_CMDLINE_COMM_FALLBACK, &args));
+ ASSERT_TRUE(strv_equal(args, STRV_MAKE("foo", "bar")));
args = strv_free(args);
- assert_se(write(fd, "quux", 4) == 4);
- assert_se(pid_get_cmdline(0, SIZE_MAX, 0, &line) >= 0);
+ ASSERT_OK_EQ_ERRNO(write(fd, "quux", 4), 4);
+ ASSERT_OK(pid_get_cmdline(0, SIZE_MAX, 0, &line));
log_debug("'%s'", line);
ASSERT_STREQ(line, "foo bar quux");
line = mfree(line);
- assert_se(pid_get_cmdline(0, SIZE_MAX, PROCESS_CMDLINE_COMM_FALLBACK, &line) >= 0);
+ ASSERT_OK(pid_get_cmdline(0, SIZE_MAX, PROCESS_CMDLINE_COMM_FALLBACK, &line));
log_debug("'%s'", line);
ASSERT_STREQ(line, "foo bar quux");
line = mfree(line);
- assert_se(pid_get_cmdline(0, 1, PROCESS_CMDLINE_COMM_FALLBACK, &line) >= 0);
+ ASSERT_OK(pid_get_cmdline(0, 1, PROCESS_CMDLINE_COMM_FALLBACK, &line));
log_debug("'%s'", line);
ASSERT_STREQ(line, "…");
line = mfree(line);
- assert_se(pid_get_cmdline(0, 2, PROCESS_CMDLINE_COMM_FALLBACK, &line) >= 0);
+ ASSERT_OK(pid_get_cmdline(0, 2, PROCESS_CMDLINE_COMM_FALLBACK, &line));
log_debug("'%s'", line);
ASSERT_STREQ(line, "f…");
line = mfree(line);
- assert_se(pid_get_cmdline(0, 3, PROCESS_CMDLINE_COMM_FALLBACK, &line) >= 0);
+ ASSERT_OK(pid_get_cmdline(0, 3, PROCESS_CMDLINE_COMM_FALLBACK, &line));
log_debug("'%s'", line);
ASSERT_STREQ(line, "fo…");
line = mfree(line);
- assert_se(pid_get_cmdline(0, 4, PROCESS_CMDLINE_COMM_FALLBACK, &line) >= 0);
+ ASSERT_OK(pid_get_cmdline(0, 4, PROCESS_CMDLINE_COMM_FALLBACK, &line));
log_debug("'%s'", line);
ASSERT_STREQ(line, "foo…");
line = mfree(line);
- assert_se(pid_get_cmdline(0, 5, PROCESS_CMDLINE_COMM_FALLBACK, &line) >= 0);
+ ASSERT_OK(pid_get_cmdline(0, 5, PROCESS_CMDLINE_COMM_FALLBACK, &line));
log_debug("'%s'", line);
ASSERT_STREQ(line, "foo …");
line = mfree(line);
- assert_se(pid_get_cmdline(0, 6, PROCESS_CMDLINE_COMM_FALLBACK, &line) >= 0);
+ ASSERT_OK(pid_get_cmdline(0, 6, PROCESS_CMDLINE_COMM_FALLBACK, &line));
log_debug("'%s'", line);
ASSERT_STREQ(line, "foo b…");
line = mfree(line);
- assert_se(pid_get_cmdline(0, 7, PROCESS_CMDLINE_COMM_FALLBACK, &line) >= 0);
+ ASSERT_OK(pid_get_cmdline(0, 7, PROCESS_CMDLINE_COMM_FALLBACK, &line));
log_debug("'%s'", line);
ASSERT_STREQ(line, "foo ba…");
line = mfree(line);
- assert_se(pid_get_cmdline(0, 8, PROCESS_CMDLINE_COMM_FALLBACK, &line) >= 0);
+ ASSERT_OK(pid_get_cmdline(0, 8, PROCESS_CMDLINE_COMM_FALLBACK, &line));
log_debug("'%s'", line);
ASSERT_STREQ(line, "foo bar…");
line = mfree(line);
- assert_se(pid_get_cmdline(0, 9, PROCESS_CMDLINE_COMM_FALLBACK, &line) >= 0);
+ ASSERT_OK(pid_get_cmdline(0, 9, PROCESS_CMDLINE_COMM_FALLBACK, &line));
log_debug("'%s'", line);
ASSERT_STREQ(line, "foo bar …");
line = mfree(line);
- assert_se(pid_get_cmdline(0, 10, PROCESS_CMDLINE_COMM_FALLBACK, &line) >= 0);
+ ASSERT_OK(pid_get_cmdline(0, 10, PROCESS_CMDLINE_COMM_FALLBACK, &line));
log_debug("'%s'", line);
ASSERT_STREQ(line, "foo bar q…");
line = mfree(line);
- assert_se(pid_get_cmdline(0, 11, PROCESS_CMDLINE_COMM_FALLBACK, &line) >= 0);
+ ASSERT_OK(pid_get_cmdline(0, 11, PROCESS_CMDLINE_COMM_FALLBACK, &line));
log_debug("'%s'", line);
ASSERT_STREQ(line, "foo bar qu…");
line = mfree(line);
- assert_se(pid_get_cmdline(0, 12, PROCESS_CMDLINE_COMM_FALLBACK, &line) >= 0);
+ ASSERT_OK(pid_get_cmdline(0, 12, PROCESS_CMDLINE_COMM_FALLBACK, &line));
log_debug("'%s'", line);
ASSERT_STREQ(line, "foo bar quux");
line = mfree(line);
- assert_se(pid_get_cmdline(0, 13, PROCESS_CMDLINE_COMM_FALLBACK, &line) >= 0);
+ ASSERT_OK(pid_get_cmdline(0, 13, PROCESS_CMDLINE_COMM_FALLBACK, &line));
log_debug("'%s'", line);
ASSERT_STREQ(line, "foo bar quux");
line = mfree(line);
- assert_se(pid_get_cmdline(0, 14, PROCESS_CMDLINE_COMM_FALLBACK, &line) >= 0);
+ ASSERT_OK(pid_get_cmdline(0, 14, PROCESS_CMDLINE_COMM_FALLBACK, &line));
log_debug("'%s'", line);
ASSERT_STREQ(line, "foo bar quux");
line = mfree(line);
- assert_se(pid_get_cmdline(0, 1000, PROCESS_CMDLINE_COMM_FALLBACK, &line) >= 0);
+ ASSERT_OK(pid_get_cmdline(0, 1000, PROCESS_CMDLINE_COMM_FALLBACK, &line));
log_debug("'%s'", line);
ASSERT_STREQ(line, "foo bar quux");
line = mfree(line);
- assert_se(pid_get_cmdline_strv(0, PROCESS_CMDLINE_COMM_FALLBACK, &args) >= 0);
- assert_se(strv_equal(args, STRV_MAKE("foo", "bar", "quux")));
+ ASSERT_OK(pid_get_cmdline_strv(0, PROCESS_CMDLINE_COMM_FALLBACK, &args));
+ ASSERT_TRUE(strv_equal(args, STRV_MAKE("foo", "bar", "quux")));
args = strv_free(args);
- assert_se(ftruncate(fd, 0) >= 0);
- assert_se(prctl(PR_SET_NAME, "aaaa bbbb cccc") >= 0);
+ ASSERT_OK_ERRNO(ftruncate(fd, 0));
+ ASSERT_OK_ERRNO(prctl(PR_SET_NAME, "aaaa bbbb cccc"));
- assert_se(pid_get_cmdline(0, SIZE_MAX, 0, &line) == -ENOENT);
+ ASSERT_ERROR(pid_get_cmdline(0, SIZE_MAX, 0, &line), ENOENT);
- assert_se(pid_get_cmdline(0, SIZE_MAX, PROCESS_CMDLINE_COMM_FALLBACK, &line) >= 0);
+ ASSERT_OK(pid_get_cmdline(0, SIZE_MAX, PROCESS_CMDLINE_COMM_FALLBACK, &line));
log_debug("'%s'", line);
ASSERT_STREQ(line, "[aaaa bbbb cccc]");
line = mfree(line);
- assert_se(pid_get_cmdline(0, 10, PROCESS_CMDLINE_COMM_FALLBACK, &line) >= 0);
+ ASSERT_OK(pid_get_cmdline(0, 10, PROCESS_CMDLINE_COMM_FALLBACK, &line));
log_debug("'%s'", line);
ASSERT_STREQ(line, "[aaaa bbb…");
line = mfree(line);
- assert_se(pid_get_cmdline(0, 11, PROCESS_CMDLINE_COMM_FALLBACK, &line) >= 0);
+ ASSERT_OK(pid_get_cmdline(0, 11, PROCESS_CMDLINE_COMM_FALLBACK, &line));
log_debug("'%s'", line);
ASSERT_STREQ(line, "[aaaa bbbb…");
line = mfree(line);
- assert_se(pid_get_cmdline(0, 12, PROCESS_CMDLINE_COMM_FALLBACK, &line) >= 0);
+ ASSERT_OK(pid_get_cmdline(0, 12, PROCESS_CMDLINE_COMM_FALLBACK, &line));
log_debug("'%s'", line);
ASSERT_STREQ(line, "[aaaa bbbb …");
line = mfree(line);
- assert_se(pid_get_cmdline_strv(0, PROCESS_CMDLINE_COMM_FALLBACK, &args) >= 0);
- assert_se(strv_equal(args, STRV_MAKE("[aaaa bbbb cccc]")));
+ ASSERT_OK(pid_get_cmdline_strv(0, PROCESS_CMDLINE_COMM_FALLBACK, &args));
+ ASSERT_TRUE(strv_equal(args, STRV_MAKE("[aaaa bbbb cccc]")));
args = strv_free(args);
/* Test with multiple arguments that do require quoting */
#define EXPECT1p "foo $'\\'bar\\'' $'\"bar$\"' $'x y z' $'!``'"
#define EXPECT1v STRV_MAKE("foo", "'bar'", "\"bar$\"", "x y z", "!``")
- assert_se(lseek(fd, SEEK_SET, 0) == 0);
- assert_se(write(fd, CMDLINE1, sizeof CMDLINE1) == sizeof CMDLINE1);
- assert_se(ftruncate(fd, sizeof CMDLINE1) == 0);
+ ASSERT_OK_ZERO_ERRNO(lseek(fd, SEEK_SET, 0));
+ ASSERT_OK_EQ_ERRNO(write(fd, CMDLINE1, sizeof(CMDLINE1)), (ssize_t) sizeof(CMDLINE1));
+ ASSERT_OK_ZERO_ERRNO(ftruncate(fd, sizeof(CMDLINE1)));
- assert_se(pid_get_cmdline(0, SIZE_MAX, PROCESS_CMDLINE_QUOTE, &line) >= 0);
+ ASSERT_OK(pid_get_cmdline(0, SIZE_MAX, PROCESS_CMDLINE_QUOTE, &line));
log_debug("got: ==%s==", line);
log_debug("exp: ==%s==", EXPECT1);
ASSERT_STREQ(line, EXPECT1);
line = mfree(line);
- assert_se(pid_get_cmdline(0, SIZE_MAX, PROCESS_CMDLINE_QUOTE_POSIX, &line) >= 0);
+ ASSERT_OK(pid_get_cmdline(0, SIZE_MAX, PROCESS_CMDLINE_QUOTE_POSIX, &line));
log_debug("got: ==%s==", line);
log_debug("exp: ==%s==", EXPECT1p);
ASSERT_STREQ(line, EXPECT1p);
line = mfree(line);
- assert_se(pid_get_cmdline_strv(0, 0, &args) >= 0);
- assert_se(strv_equal(args, EXPECT1v));
+ ASSERT_OK(pid_get_cmdline_strv(0, 0, &args));
+ ASSERT_TRUE(strv_equal(args, EXPECT1v));
args = strv_free(args);
#define CMDLINE2 "foo\0\1\2\3\0\0"
#define EXPECT2p "foo $'\\001\\002\\003'"
#define EXPECT2v STRV_MAKE("foo", "\1\2\3")
- assert_se(lseek(fd, SEEK_SET, 0) == 0);
- assert_se(write(fd, CMDLINE2, sizeof CMDLINE2) == sizeof CMDLINE2);
- assert_se(ftruncate(fd, sizeof CMDLINE2) == 0);
+ ASSERT_OK_ZERO_ERRNO(lseek(fd, SEEK_SET, 0));
+ ASSERT_OK_EQ_ERRNO(write(fd, CMDLINE2, sizeof(CMDLINE2)), (ssize_t) sizeof(CMDLINE2));
+ ASSERT_OK_ZERO_ERRNO(ftruncate(fd, sizeof CMDLINE2));
- assert_se(pid_get_cmdline(0, SIZE_MAX, PROCESS_CMDLINE_QUOTE, &line) >= 0);
+ ASSERT_OK(pid_get_cmdline(0, SIZE_MAX, PROCESS_CMDLINE_QUOTE, &line));
log_debug("got: ==%s==", line);
log_debug("exp: ==%s==", EXPECT2);
ASSERT_STREQ(line, EXPECT2);
line = mfree(line);
- assert_se(pid_get_cmdline(0, SIZE_MAX, PROCESS_CMDLINE_QUOTE_POSIX, &line) >= 0);
+ ASSERT_OK(pid_get_cmdline(0, SIZE_MAX, PROCESS_CMDLINE_QUOTE_POSIX, &line));
log_debug("got: ==%s==", line);
log_debug("exp: ==%s==", EXPECT2p);
ASSERT_STREQ(line, EXPECT2p);
line = mfree(line);
- assert_se(pid_get_cmdline_strv(0, 0, &args) >= 0);
- assert_se(strv_equal(args, EXPECT2v));
+ ASSERT_OK(pid_get_cmdline_strv(0, 0, &args));
+ ASSERT_TRUE(strv_equal(args, EXPECT2v));
args = strv_free(args);
safe_close(fd);
b = getpid_cached();
c = getpid();
- assert_se(a == b && a == c);
+ ASSERT_EQ(a, b);
+ ASSERT_EQ(a, c);
child = fork();
- assert_se(child >= 0);
+ ASSERT_OK_ERRNO(child);
if (child == 0) {
/* In child */
b = getpid_cached();
c = getpid();
- assert_se(a == b && a == c);
+ ASSERT_EQ(a, b);
+ ASSERT_EQ(a, c);
_exit(EXIT_SUCCESS);
}
e = getpid_cached();
f = getpid();
- assert_se(a == d && a == e && a == f);
+ ASSERT_EQ(a, d);
+ ASSERT_EQ(a, e);
+ ASSERT_EQ(a, f);
- assert_se(wait_for_terminate(child, &si) >= 0);
- assert_se(si.si_status == 0);
- assert_se(si.si_code == CLD_EXITED);
+ ASSERT_OK(wait_for_terminate(child, &si));
+ ASSERT_EQ(si.si_status, 0);
+ ASSERT_EQ(si.si_code, CLD_EXITED);
}
TEST(getpid_measure) {
BLOCK_SIGNALS(SIGCHLD);
r = safe_fork("(test-child)", FORK_RESET_SIGNALS|FORK_CLOSE_ALL_FDS|FORK_DEATHSIG_SIGTERM|FORK_REARRANGE_STDIO|FORK_REOPEN_LOG, &pid);
- assert_se(r >= 0);
+ ASSERT_OK(r);
if (r == 0) {
/* child */
_exit(88);
}
- assert_se(wait_for_terminate(pid, &status) >= 0);
- assert_se(status.si_code == CLD_EXITED);
- assert_se(status.si_status == 88);
+ ASSERT_OK(wait_for_terminate(pid, &status));
+ ASSERT_EQ(status.si_code, CLD_EXITED);
+ ASSERT_EQ(status.si_status, 88);
}
TEST(pid_to_ptr) {
- assert_se(PTR_TO_PID(NULL) == 0);
+ ASSERT_EQ(PTR_TO_PID(NULL), 0);
ASSERT_NULL(PID_TO_PTR(0));
- assert_se(PTR_TO_PID(PID_TO_PTR(1)) == 1);
- assert_se(PTR_TO_PID(PID_TO_PTR(2)) == 2);
- assert_se(PTR_TO_PID(PID_TO_PTR(-1)) == -1);
- assert_se(PTR_TO_PID(PID_TO_PTR(-2)) == -2);
+ ASSERT_EQ(PTR_TO_PID(PID_TO_PTR(1)), 1);
+ ASSERT_EQ(PTR_TO_PID(PID_TO_PTR(2)), 2);
+ ASSERT_EQ(PTR_TO_PID(PID_TO_PTR(-1)), -1);
+ ASSERT_EQ(PTR_TO_PID(PID_TO_PTR(-2)), -2);
- assert_se(PTR_TO_PID(PID_TO_PTR(INT16_MAX)) == INT16_MAX);
- assert_se(PTR_TO_PID(PID_TO_PTR(INT16_MIN)) == INT16_MIN);
+ ASSERT_EQ(PTR_TO_PID(PID_TO_PTR(INT16_MAX)), INT16_MAX);
+ ASSERT_EQ(PTR_TO_PID(PID_TO_PTR(INT16_MIN)), INT16_MIN);
- assert_se(PTR_TO_PID(PID_TO_PTR(INT32_MAX)) == INT32_MAX);
- assert_se(PTR_TO_PID(PID_TO_PTR(INT32_MIN)) == INT32_MIN);
+ ASSERT_EQ(PTR_TO_PID(PID_TO_PTR(INT32_MAX)), INT32_MAX);
+ ASSERT_EQ(PTR_TO_PID(PID_TO_PTR(INT32_MIN)), INT32_MIN);
}
static void test_ioprio_class_from_to_string_one(const char *val, int expected, int normalized) {
- assert_se(ioprio_class_from_string(val) == expected);
+ ASSERT_EQ(ioprio_class_from_string(val), expected);
if (expected >= 0) {
_cleanup_free_ char *s = NULL;
unsigned ret;
int combined;
- assert_se(ioprio_class_to_string_alloc(expected, &s) == 0);
+ ASSERT_OK_ZERO(ioprio_class_to_string_alloc(expected, &s));
/* We sometimes get a class number and sometimes a name back */
- assert_se(streq(s, val) ||
- safe_atou(val, &ret) == 0);
+ ASSERT_TRUE(streq(s, val) || safe_atou(val, &ret) == 0);
/* Make sure normalization works, i.e. NONE → BE gets normalized */
combined = ioprio_normalize(ioprio_prio_value(expected, 0));
- assert_se(ioprio_prio_class(combined) == normalized);
- assert_se(expected != IOPRIO_CLASS_NONE || ioprio_prio_data(combined) == 4);
+ ASSERT_EQ(ioprio_prio_class(combined), normalized);
+ ASSERT_TRUE(expected != IOPRIO_CLASS_NONE || ioprio_prio_data(combined) == 4);
}
}
r = safe_fork("(test-setprio)",
FORK_RESET_SIGNALS|FORK_CLOSE_ALL_FDS|FORK_DEATHSIG_SIGTERM|FORK_WAIT|FORK_LOG, NULL);
- assert_se(r >= 0);
+ ASSERT_OK(r);
if (r == 0) {
bool full_test;
if (setrlimit(RLIMIT_NICE, &RLIMIT_MAKE_CONST(30)) < 0) {
/* If this fails we are probably unprivileged or in a userns of some kind, let's skip
* the full test */
- assert_se(ERRNO_IS_PRIVILEGE(errno));
+ if (!ERRNO_IS_PRIVILEGE(errno))
+ ASSERT_OK_ERRNO(-1);
full_test = false;
} else {
/* However, if the hard limit was above 30, setrlimit would succeed unprivileged, so
* check if the UID/GID can be changed before enabling the full test. */
if (setresgid(GID_NOBODY, GID_NOBODY, GID_NOBODY) < 0) {
- assert_se(ERRNO_IS_PRIVILEGE(errno));
+ if (!ERRNO_IS_PRIVILEGE(errno))
+ ASSERT_OK_ERRNO(-1);
full_test = false;
} else if (setresuid(UID_NOBODY, UID_NOBODY, UID_NOBODY) < 0) {
- assert_se(ERRNO_IS_PRIVILEGE(errno));
+ if (!ERRNO_IS_PRIVILEGE(errno))
+ ASSERT_OK_ERRNO(-1);
full_test = false;
} else
full_test = true;
errno = 0;
p = getpriority(PRIO_PROCESS, 0);
- assert_se(errno == 0);
+ ASSERT_EQ(errno, 0);
/* It should always be possible to set our nice level to the current one */
- assert_se(setpriority_closest(p) > 0);
+ ASSERT_OK_POSITIVE(setpriority_closest(p));
errno = 0;
q = getpriority(PRIO_PROCESS, 0);
- assert_se(errno == 0 && p == q);
+ ASSERT_EQ(errno, 0);
+ ASSERT_EQ(p, q);
/* It should also be possible to set the nice level to one higher */
if (p < PRIO_MAX-1) {
- assert_se(setpriority_closest(++p) > 0);
+ ASSERT_OK_POSITIVE(setpriority_closest(++p));
errno = 0;
q = getpriority(PRIO_PROCESS, 0);
- assert_se(errno == 0 && p == q);
+ ASSERT_EQ(errno, 0);
+ ASSERT_EQ(p, q);
}
/* It should also be possible to set the nice level to two higher */
if (p < PRIO_MAX-1) {
- assert_se(setpriority_closest(++p) > 0);
+ ASSERT_OK_POSITIVE(setpriority_closest(++p));
errno = 0;
q = getpriority(PRIO_PROCESS, 0);
- assert_se(errno == 0 && p == q);
+ ASSERT_EQ(errno, 0);
+ ASSERT_EQ(p, q);
}
if (full_test) {
/* These two should work, given the RLIMIT_NICE we set above */
- assert_se(setpriority_closest(-10) > 0);
+ ASSERT_OK_POSITIVE(setpriority_closest(-10));
errno = 0;
q = getpriority(PRIO_PROCESS, 0);
- assert_se(errno == 0 && q == -10);
+ ASSERT_EQ(errno, 0);
+ ASSERT_EQ(q, -10);
- assert_se(setpriority_closest(-9) > 0);
+ ASSERT_OK_POSITIVE(setpriority_closest(-9));
errno = 0;
q = getpriority(PRIO_PROCESS, 0);
- assert_se(errno == 0 && q == -9);
+ ASSERT_EQ(errno, 0);
+ ASSERT_EQ(q, -9);
/* This should succeed but should be clamped to the limit */
- assert_se(setpriority_closest(-11) == 0);
+ ASSERT_OK_ZERO(setpriority_closest(-11));
errno = 0;
q = getpriority(PRIO_PROCESS, 0);
- assert_se(errno == 0 && q == -10);
+ ASSERT_EQ(errno, 0);
+ ASSERT_EQ(q, -10);
- assert_se(setpriority_closest(-8) > 0);
+ ASSERT_OK_POSITIVE(setpriority_closest(-8));
errno = 0;
q = getpriority(PRIO_PROCESS, 0);
- assert_se(errno == 0 && q == -8);
+ ASSERT_EQ(errno, 0);
+ ASSERT_EQ(q, -8);
/* This should succeed but should be clamped to the limit */
- assert_se(setpriority_closest(-12) == 0);
+ ASSERT_OK_ZERO(setpriority_closest(-12));
errno = 0;
q = getpriority(PRIO_PROCESS, 0);
- assert_se(errno == 0 && q == -10);
+ ASSERT_EQ(errno, 0);
+ ASSERT_EQ(q, -10);
}
_exit(EXIT_SUCCESS);
uint64_t limit;
int r;
- assert_se(get_process_ppid(1, NULL) == -EADDRNOTAVAIL);
+ ASSERT_ERROR(get_process_ppid(1, NULL), EADDRNOTAVAIL);
/* the process with the PID above the global limit definitely doesn't exist. Verify that */
- assert_se(procfs_get_pid_max(&limit) >= 0);
+ ASSERT_OK(procfs_get_pid_max(&limit));
log_debug("kernel.pid_max = %"PRIu64, limit);
if (limit < INT_MAX) {
break;
}
- assert_se(r >= 0);
+ ASSERT_OK(r);
- assert_se(pid_get_cmdline(pid, SIZE_MAX, PROCESS_CMDLINE_COMM_FALLBACK, &c1) >= 0);
- assert_se(pid_get_cmdline(ppid, SIZE_MAX, PROCESS_CMDLINE_COMM_FALLBACK, &c2) >= 0);
+ ASSERT_OK(pid_get_cmdline(pid, SIZE_MAX, PROCESS_CMDLINE_COMM_FALLBACK, &c1));
+ ASSERT_OK(pid_get_cmdline(ppid, SIZE_MAX, PROCESS_CMDLINE_COMM_FALLBACK, &c2));
log_info("Parent of " PID_FMT " (%s) is " PID_FMT " (%s).", pid, c1, ppid, c2);
TEST(set_oom_score_adjust) {
int a, b, r;
- assert_se(get_oom_score_adjust(&a) >= 0);
+ ASSERT_OK(get_oom_score_adjust(&a));
r = set_oom_score_adjust(OOM_SCORE_ADJ_MIN);
- assert_se(r >= 0 || ERRNO_IS_PRIVILEGE(r));
+ if (!ERRNO_IS_PRIVILEGE(r))
+ ASSERT_OK(r);
if (r >= 0) {
- assert_se(get_oom_score_adjust(&b) >= 0);
- assert_se(b == OOM_SCORE_ADJ_MIN);
+ ASSERT_OK(get_oom_score_adjust(&b));
+ ASSERT_EQ(b, OOM_SCORE_ADJ_MIN);
}
- assert_se(set_oom_score_adjust(a) >= 0);
- assert_se(get_oom_score_adjust(&b) >= 0);
- assert_se(b == a);
+ ASSERT_OK(set_oom_score_adjust(a));
+ ASSERT_OK(get_oom_score_adjust(&b));
+ ASSERT_EQ(b, a);
}
static void* dummy_thread(void *p) {
char x;
/* let main thread know we are ready */
- assert_se(write(fd, &(const char) { 'x' }, 1) == 1);
+ ASSERT_OK_EQ_ERRNO(write(fd, &(const char) { 'x' }, 1), 1);
/* wait for the main thread to tell us to shut down */
- assert_se(read(fd, &x, 1) == 1);
+ ASSERT_OK_EQ_ERRNO(read(fd, &x, 1), 1);
return NULL;
}
/* Run this test in a child, so that we can guarantee there's exactly one thread around in the child */
r = safe_fork("(nthreads)", FORK_RESET_SIGNALS|FORK_DEATHSIG_SIGTERM|FORK_REOPEN_LOG|FORK_WAIT|FORK_LOG, NULL);
- assert_se(r >= 0);
+ ASSERT_OK(r);
if (r == 0) {
_cleanup_close_pair_ int pfd[2] = EBADF_PAIR, ppfd[2] = EBADF_PAIR;
pthread_t t, tt;
char x;
- assert_se(socketpair(AF_UNIX, SOCK_STREAM|SOCK_CLOEXEC, 0, pfd) >= 0);
- assert_se(socketpair(AF_UNIX, SOCK_STREAM|SOCK_CLOEXEC, 0, ppfd) >= 0);
+ ASSERT_OK_ERRNO(socketpair(AF_UNIX, SOCK_STREAM|SOCK_CLOEXEC, 0, pfd));
+ ASSERT_OK_ERRNO(socketpair(AF_UNIX, SOCK_STREAM|SOCK_CLOEXEC, 0, ppfd));
- assert_se(get_process_threads(0) == 1);
- assert_se(pthread_create(&t, NULL, &dummy_thread, FD_TO_PTR(pfd[0])) == 0);
- assert_se(read(pfd[1], &x, 1) == 1);
- assert_se(get_process_threads(0) == 2);
- assert_se(pthread_create(&tt, NULL, &dummy_thread, FD_TO_PTR(ppfd[0])) == 0);
- assert_se(read(ppfd[1], &x, 1) == 1);
- assert_se(get_process_threads(0) == 3);
+ ASSERT_OK_EQ(get_process_threads(0), 1);
+ ASSERT_OK_ZERO_ERRNO(pthread_create(&t, NULL, &dummy_thread, FD_TO_PTR(pfd[0])));
+ ASSERT_OK_EQ_ERRNO(read(pfd[1], &x, 1), 1);
+ ASSERT_OK_EQ(get_process_threads(0), 2);
+ ASSERT_OK_ZERO_ERRNO(pthread_create(&tt, NULL, &dummy_thread, FD_TO_PTR(ppfd[0])));
+ ASSERT_OK_EQ_ERRNO(read(ppfd[1], &x, 1), 1);
+ ASSERT_OK_EQ(get_process_threads(0), 3);
- assert_se(write(pfd[1], &(const char) { 'x' }, 1) == 1);
- assert_se(pthread_join(t, NULL) == 0);
+ ASSERT_OK_EQ_ERRNO(write(pfd[1], &(const char) { 'x' }, 1), 1);
+ ASSERT_OK_ZERO_ERRNO(pthread_join(t, NULL));
/* the value reported via /proc/ is decreased asynchronously, and there appears to be no nice
* way to sync on it. Hence we do the weak >= 2 check, even though == 2 is what we'd actually
* like to check here */
- assert_se(get_process_threads(0) >= 2);
+ r = get_process_threads(0);
+ ASSERT_OK(r);
+ ASSERT_GE(r, 2);
- assert_se(write(ppfd[1], &(const char) { 'x' }, 1) == 1);
- assert_se(pthread_join(tt, NULL) == 0);
+ ASSERT_OK_EQ_ERRNO(write(ppfd[1], &(const char) { 'x' }, 1), 1);
+ ASSERT_OK_ZERO_ERRNO(pthread_join(tt, NULL));
/* similar here */
- assert_se(get_process_threads(0) >= 1);
+ r = get_process_threads(0);
+ ASSERT_OK(r);
+ ASSERT_GE(r, 1);
_exit(EXIT_SUCCESS);
}
int r;
r = safe_fork("(regular)", FORK_RESET_SIGNALS|FORK_CLOSE_ALL_FDS|FORK_WAIT, NULL);
- assert_se(r >= 0);
+ ASSERT_OK(r);
if (r == 0) {
/* child */
- assert_se(is_reaper_process() == 0);
+ ASSERT_OK_ZERO(is_reaper_process());
_exit(EXIT_SUCCESS);
}
r = safe_fork("(newpid)", FORK_RESET_SIGNALS|FORK_CLOSE_ALL_FDS|FORK_WAIT, NULL);
- assert_se(r >= 0);
+ ASSERT_OK(r);
if (r == 0) {
/* child */
}
r = safe_fork("(newpid1)", FORK_RESET_SIGNALS|FORK_CLOSE_ALL_FDS|FORK_WAIT, NULL);
- assert_se(r >= 0);
+ ASSERT_OK(r);
if (r == 0) {
/* grandchild, which is PID1 in a pidns */
- assert_se(getpid_cached() == 1);
- assert_se(is_reaper_process() > 0);
+ ASSERT_OK_EQ(getpid_cached(), 1);
+ ASSERT_OK_POSITIVE(is_reaper_process());
_exit(EXIT_SUCCESS);
}
}
r = safe_fork("(subreaper)", FORK_RESET_SIGNALS|FORK_CLOSE_ALL_FDS|FORK_WAIT, NULL);
- assert_se(r >= 0);
+ ASSERT_OK(r);
if (r == 0) {
/* child */
- assert_se(make_reaper_process(true) >= 0);
+ ASSERT_OK(make_reaper_process(true));
- assert_se(is_reaper_process() > 0);
+ ASSERT_OK_POSITIVE(is_reaper_process());
_exit(EXIT_SUCCESS);
}
}
TEST(pid_get_start_time) {
_cleanup_(pidref_done) PidRef pidref = PIDREF_NULL;
- assert_se(pidref_set_self(&pidref) >= 0);
+ ASSERT_OK(pidref_set_self(&pidref));
usec_t start_time;
- assert_se(pidref_get_start_time(&pidref, &start_time) >= 0);
+ ASSERT_OK(pidref_get_start_time(&pidref, &start_time));
log_info("our starttime: " USEC_FMT, start_time);
_cleanup_(pidref_done_sigkill_wait) PidRef child = PIDREF_NULL;
- assert_se(pidref_safe_fork("(stub)", FORK_RESET_SIGNALS|FORK_CLOSE_ALL_FDS, &child) >= 0);
+ ASSERT_OK(pidref_safe_fork("(stub)", FORK_RESET_SIGNALS|FORK_CLOSE_ALL_FDS, &child));
usec_t start_time2;
- assert_se(pidref_get_start_time(&child, &start_time2) >= 0);
+ ASSERT_OK(pidref_get_start_time(&child, &start_time2));
log_info("child starttime: " USEC_FMT, start_time2);
- assert_se(start_time2 >= start_time);
+ ASSERT_GE(start_time2, start_time);
}
static int intro(void) {
projects / thirdparty / systemd.git / commitdiff
