From a923ca6945b6d3cc45e6fe45e59686df24a17e4d Mon Sep 17 00:00:00 2001 From: Anouk Ceyssens Date: Mon, 22 Jul 2024 23:40:21 +0200 Subject: [PATCH] test-dev-setup: use new assertion macros --- src/test/test-dev-setup.c | 44 +++++++++++++++++++-------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/src/test/test-dev-setup.c b/src/test/test-dev-setup.c index ed56710d9e7..9357debf607 100644 --- a/src/test/test-dev-setup.c +++ b/src/test/test-dev-setup.c @@ -19,48 +19,48 @@ int main(int argc, char *argv[]) { if (have_effective_cap(CAP_DAC_OVERRIDE) <= 0) return log_tests_skipped("missing capability (CAP_DAC_OVERRIDE)"); - assert_se(mkdtemp_malloc("/tmp/test-dev-setupXXXXXX", &p) >= 0); + ASSERT_OK(mkdtemp_malloc("/tmp/test-dev-setupXXXXXX", &p)); f = prefix_roota(p, "/run/systemd"); - assert_se(mkdir_p(f, 0755) >= 0); + ASSERT_OK(mkdir_p(f, 0755)); - assert_se(make_inaccessible_nodes(f, 1, 1) >= 0); - assert_se(make_inaccessible_nodes(f, 1, 1) >= 0); /* 2nd call should be a clean NOP */ + ASSERT_OK(make_inaccessible_nodes(f, 1, 1)); + ASSERT_OK(make_inaccessible_nodes(f, 1, 1)); /* 2nd call should be a clean NOP */ f = prefix_roota(p, "/run/systemd/inaccessible/reg"); - assert_se(stat(f, &st) >= 0); - assert_se(S_ISREG(st.st_mode)); - assert_se((st.st_mode & 07777) == 0000); + ASSERT_OK_ERRNO(stat(f, &st)); + ASSERT_TRUE(S_ISREG(st.st_mode)); + ASSERT_EQ((st.st_mode & 07777), 0000); f = prefix_roota(p, "/run/systemd/inaccessible/dir"); - assert_se(stat(f, &st) >= 0); - assert_se(S_ISDIR(st.st_mode)); - assert_se((st.st_mode & 07777) == 0000); + ASSERT_OK_ERRNO(stat(f, &st)); + ASSERT_TRUE(S_ISDIR(st.st_mode)); + ASSERT_EQ((st.st_mode & 07777), 0000); f = prefix_roota(p, "/run/systemd/inaccessible/fifo"); - assert_se(stat(f, &st) >= 0); - assert_se(S_ISFIFO(st.st_mode)); - assert_se((st.st_mode & 07777) == 0000); + ASSERT_OK_ERRNO(stat(f, &st)); + ASSERT_TRUE(S_ISFIFO(st.st_mode)); + ASSERT_EQ((st.st_mode & 07777), 0000); f = prefix_roota(p, "/run/systemd/inaccessible/sock"); - assert_se(stat(f, &st) >= 0); - assert_se(S_ISSOCK(st.st_mode)); - assert_se((st.st_mode & 07777) == 0000); + ASSERT_OK_ERRNO(stat(f, &st)); + ASSERT_TRUE(S_ISSOCK(st.st_mode)); + ASSERT_EQ((st.st_mode & 07777), 0000); f = prefix_roota(p, "/run/systemd/inaccessible/chr"); if (stat(f, &st) < 0) - assert_se(errno == ENOENT); + ASSERT_EQ(errno, ENOENT); else { - assert_se(S_ISCHR(st.st_mode)); - assert_se((st.st_mode & 07777) == 0000); + ASSERT_TRUE(S_ISCHR(st.st_mode)); + ASSERT_EQ((st.st_mode & 07777), 0000); } f = prefix_roota(p, "/run/systemd/inaccessible/blk"); if (stat(f, &st) < 0) - assert_se(errno == ENOENT); + ASSERT_EQ(errno, ENOENT); else { - assert_se(S_ISBLK(st.st_mode)); - assert_se((st.st_mode & 07777) == 0000); + ASSERT_TRUE(S_ISBLK(st.st_mode)); + ASSERT_EQ((st.st_mode & 07777), 0000); } return EXIT_SUCCESS; -- 2.47.3