test: converted unittest in src/test/test-mkdir.c to use new ASSERT_OK() macros and...

diff --git a/src/test/test-mkdir.c b/src/test/test-mkdir.c
index bd4698f0832eae8bb8d038746c0731d59145150c..c6f187b21907d4c7ddd0a3dc5d1e9d47f8d4cbb2 100644 (file)
--- a/src/test/test-mkdir.c
+++ b/src/test/test-mkdir.c
@@ -18,109 +18,108 @@ TEST(mkdir_p_safe) {
         _cleanup_free_ char *p = NULL, *q = NULL;
         int r;
 
-        assert_se(mkdtemp_malloc("/tmp/test-mkdir-XXXXXX", &tmp) >= 0);
+        ASSERT_OK(mkdtemp_malloc("/tmp/test-mkdir-XXXXXX", &tmp));
 
-        assert_se(p = path_join(tmp, "run/aaa/bbb"));
-        assert_se(mkdir_p(p, 0755) >= 0);
-        assert_se(is_dir(p, false) > 0);
-        assert_se(is_dir(p, true) > 0);
+        ASSERT_NOT_NULL(p = path_join(tmp, "run/aaa/bbb"));
+        ASSERT_OK(mkdir_p(p, 0755));
+        ASSERT_OK_POSITIVE(is_dir(p, false));
+        ASSERT_OK_POSITIVE(is_dir(p, true));
 
         p = mfree(p);
-        assert_se(p = path_join(tmp, "run/ccc/ddd"));
-        assert_se(mkdir_p_safe(tmp, p, 0755, UID_INVALID, GID_INVALID, 0) >= 0);
-        assert_se(is_dir(p, false) > 0);
-        assert_se(is_dir(p, true) > 0);
+        ASSERT_NOT_NULL(p = path_join(tmp, "run/ccc/ddd"));
+        ASSERT_OK(mkdir_p_safe(tmp, p, 0755, UID_INVALID, GID_INVALID, 0));
+        ASSERT_OK_POSITIVE(is_dir(p, false));
+        ASSERT_OK_POSITIVE(is_dir(p, true));
 
         p = mfree(p);
-        assert_se(p = path_join(tmp, "var/run"));
-        assert_se(mkdir_parents_safe(tmp, p, 0755, UID_INVALID, GID_INVALID, 0) >= 0);
-        assert_se(symlink("../run", p) >= 0);
-        assert_se(is_dir(p, false) == 0);
-        assert_se(is_dir(p, true) > 0);
+        ASSERT_NOT_NULL(p = path_join(tmp, "var/run"));
+        ASSERT_OK(mkdir_parents_safe(tmp, p, 0755, UID_INVALID, GID_INVALID, 0));
+        ASSERT_OK_ERRNO(symlink("../run", p));
+        ASSERT_OK_ZERO(is_dir(p, false));
+        ASSERT_OK_POSITIVE(is_dir(p, true));
 
-        assert_se(mkdir_safe(p, 0755, UID_INVALID, GID_INVALID, 0) == -ENOTDIR);
-        assert_se(mkdir_safe(p, 0755, UID_INVALID, GID_INVALID, MKDIR_IGNORE_EXISTING) >= 0);
-        assert_se(mkdir_safe(p, 0755, UID_INVALID, GID_INVALID, MKDIR_FOLLOW_SYMLINK) >= 0);
-        assert_se(is_dir(p, false) == 0);
-        assert_se(is_dir(p, true) > 0);
+        ASSERT_ERROR(mkdir_safe(p, 0755, UID_INVALID, GID_INVALID, 0), ENOTDIR);
+        ASSERT_OK(mkdir_safe(p, 0755, UID_INVALID, GID_INVALID, MKDIR_IGNORE_EXISTING));
+        ASSERT_OK(mkdir_safe(p, 0755, UID_INVALID, GID_INVALID, MKDIR_FOLLOW_SYMLINK));
+        ASSERT_OK_ZERO(is_dir(p, false));
+        ASSERT_OK_POSITIVE(is_dir(p, true));
 
         p = mfree(p);
-        assert_se(p = path_join(tmp, "var/run/hoge/foo/baz"));
-        assert_se(mkdir_p_safe(tmp, p, 0755, UID_INVALID, GID_INVALID, 0) >= 0);
-        assert_se(is_dir(p, false) > 0);
-        assert_se(is_dir(p, true) > 0);
+        ASSERT_NOT_NULL(p = path_join(tmp, "var/run/hoge/foo/baz"));
+        ASSERT_OK(mkdir_p_safe(tmp, p, 0755, UID_INVALID, GID_INVALID, 0));
+        ASSERT_OK_POSITIVE(is_dir(p, false));
+        ASSERT_OK_POSITIVE(is_dir(p, true));
 
         p = mfree(p);
-        assert_se(p = path_join(tmp, "not-exists"));
-        assert_se(q = path_join(p, "aaa"));
-        assert_se(mkdir_p_safe(p, q, 0755, UID_INVALID, GID_INVALID, 0) == -ENOENT);
+        ASSERT_NOT_NULL(p = path_join(tmp, "not-exists"));
+        ASSERT_NOT_NULL(q = path_join(p, "aaa"));
+        ASSERT_ERROR(mkdir_p_safe(p, q, 0755, UID_INVALID, GID_INVALID, 0), ENOENT);
 
         p = mfree(p);
         q = mfree(q);
-        assert_se(p = path_join(tmp, "regular-file"));
-        assert_se(q = path_join(p, "aaa"));
-        assert_se(touch(p) >= 0);
-        assert_se(mkdir_p_safe(p, q, 0755, UID_INVALID, GID_INVALID, 0) == -ENOTDIR);
+        ASSERT_NOT_NULL(p = path_join(tmp, "regular-file"));
+        ASSERT_NOT_NULL(q = path_join(p, "aaa"));
+        ASSERT_OK(touch(p));
+        ASSERT_ERROR(mkdir_p_safe(p, q, 0755, UID_INVALID, GID_INVALID, 0), ENOTDIR);
 
         p = mfree(p);
         q = mfree(q);
-        assert_se(p = path_join(tmp, "symlink"));
-        assert_se(q = path_join(p, "hoge/foo"));
-        assert_se(symlink("aaa", p) >= 0);
-        assert_se(mkdir_p_safe(tmp, q, 0755, UID_INVALID, GID_INVALID, 0) >= 0);
-        assert_se(is_dir(q, false) > 0);
-        assert_se(is_dir(q, true) > 0);
+        ASSERT_NOT_NULL(p = path_join(tmp, "symlink"));
+        ASSERT_NOT_NULL(q = path_join(p, "hoge/foo"));
+        ASSERT_OK_ERRNO(symlink("aaa", p));
+        ASSERT_OK(mkdir_p_safe(tmp, q, 0755, UID_INVALID, GID_INVALID, 0));
+        ASSERT_OK_POSITIVE(is_dir(q, false));
+        ASSERT_OK_POSITIVE(is_dir(q, true));
         q = mfree(q);
-        assert_se(q = path_join(tmp, "aaa/hoge/foo"));
-        assert_se(is_dir(q, false) > 0);
-        assert_se(is_dir(q, true) > 0);
+        ASSERT_NOT_NULL(q = path_join(tmp, "aaa/hoge/foo"));
+        ASSERT_OK_POSITIVE(is_dir(q, false));
+        ASSERT_OK_POSITIVE(is_dir(q, true));
 
         ASSERT_ERROR(mkdir_p_safe(tmp, "/tmp/test-mkdir-outside", 0755, UID_INVALID, GID_INVALID, 0), EINVAL);
 
         p = mfree(p);
-        assert_se(p = path_join(tmp, "zero-mode/should-fail-to-create-child"));
-        assert_se(mkdir_parents_safe(tmp, p, 0000, UID_INVALID, GID_INVALID, 0) >= 0);
-        r = safe_fork("(test-mkdir-no-cap)", FORK_DEATHSIG_SIGTERM | FORK_WAIT | FORK_LOG, NULL);
+        ASSERT_NOT_NULL(p = path_join(tmp, "zero-mode/should-fail-to-create-child"));
+        ASSERT_OK(mkdir_parents_safe(tmp, p, 0000, UID_INVALID, GID_INVALID, 0));
+        ASSERT_OK(r = safe_fork("(test-mkdir-no-cap)", FORK_DEATHSIG_SIGTERM | FORK_WAIT | FORK_LOG, NULL));
         if (r == 0) {
                 (void) capability_bounding_set_drop(0, /* right_now = */ true);
-                assert_se(mkdir_p_safe(tmp, p, 0000, UID_INVALID, GID_INVALID, 0) == -EACCES);
+                ASSERT_ERROR(mkdir_p_safe(tmp, p, 0000, UID_INVALID, GID_INVALID, 0), EACCES);
                 _exit(EXIT_SUCCESS);
         }
-        assert_se(r >= 0);
 }
 
 TEST(mkdir_p_root) {
         _cleanup_(rm_rf_physical_and_freep) char *tmp = NULL;
         _cleanup_free_ char *p = NULL;
 
-        assert_se(mkdtemp_malloc("/tmp/test-mkdir-XXXXXX", &tmp) >= 0);
+        ASSERT_OK(mkdtemp_malloc("/tmp/test-mkdir-XXXXXX", &tmp));
 
-        assert_se(p = path_join(tmp, "run/aaa/bbb"));
-        assert_se(mkdir_p_root(tmp, "/run/aaa/bbb", UID_INVALID, GID_INVALID, 0755) >= 0);
-        assert_se(is_dir(p, false) > 0);
-        assert_se(is_dir(p, true) > 0);
+        ASSERT_NOT_NULL(p = path_join(tmp, "run/aaa/bbb"));
+        ASSERT_OK(mkdir_p_root(tmp, "/run/aaa/bbb", UID_INVALID, GID_INVALID, 0755));
+        ASSERT_OK_POSITIVE(is_dir(p, false));
+        ASSERT_OK_POSITIVE(is_dir(p, true));
 
         p = mfree(p);
-        assert_se(p = path_join(tmp, "var/run"));
-        assert_se(mkdir_parents_safe(tmp, p, 0755, UID_INVALID, GID_INVALID, 0) >= 0);
-        assert_se(symlink("../run", p) >= 0);
-        assert_se(is_dir(p, false) == 0);
-        assert_se(is_dir(p, true) > 0);
+        ASSERT_NOT_NULL(p = path_join(tmp, "var/run"));
+        ASSERT_OK(mkdir_parents_safe(tmp, p, 0755, UID_INVALID, GID_INVALID, 0));
+        ASSERT_OK_ERRNO(symlink("../run", p));
+        ASSERT_OK_ZERO(is_dir(p, false));
+        ASSERT_OK_POSITIVE(is_dir(p, true));
 
         p = mfree(p);
-        assert_se(p = path_join(tmp, "var/run/hoge/foo/baz"));
-        assert_se(mkdir_p_root(tmp, "/var/run/hoge/foo/baz", UID_INVALID, GID_INVALID, 0755) >= 0);
-        assert_se(is_dir(p, false) > 0);
-        assert_se(is_dir(p, true) > 0);
+        ASSERT_NOT_NULL(p = path_join(tmp, "var/run/hoge/foo/baz"));
+        ASSERT_OK(mkdir_p_root(tmp, "/var/run/hoge/foo/baz", UID_INVALID, GID_INVALID, 0755));
+        ASSERT_OK_POSITIVE(is_dir(p, false));
+        ASSERT_OK_POSITIVE(is_dir(p, true));
 
         p = mfree(p);
-        assert_se(p = path_join(tmp, "not-exists"));
-        assert_se(mkdir_p_root(p, "/aaa", UID_INVALID, GID_INVALID, 0755) == -ENOENT);
+        ASSERT_NOT_NULL(p = path_join(tmp, "not-exists"));
+        ASSERT_ERROR(mkdir_p_root(p, "/aaa", UID_INVALID, GID_INVALID, 0755), ENOENT);
 
         p = mfree(p);
-        assert_se(p = path_join(tmp, "regular-file"));
-        assert_se(touch(p) >= 0);
-        assert_se(mkdir_p_root(p, "/aaa", UID_INVALID, GID_INVALID, 0755) == -ENOTDIR);
+        ASSERT_NOT_NULL(p = path_join(tmp, "regular-file"));
+        ASSERT_OK(touch(p));
+        ASSERT_ERROR(mkdir_p_root(p, "/aaa", UID_INVALID, GID_INVALID, 0755), ENOTDIR);
 
         /* FIXME: The tests below do not work.
         p = mfree(p);
@@ -147,8 +146,8 @@ TEST(mkdir_p_root_full) {
 
         ASSERT_NOT_NULL((p = path_join(tmp, "foo")));
         ASSERT_OK(mkdir_p_root_full(tmp, "/foo", UID_INVALID, GID_INVALID, 0755, 2 * USEC_PER_SEC, NULL));
-        ASSERT_GT(is_dir(p, false), 0);
-        ASSERT_GT(is_dir(p, true), 0);
+        ASSERT_OK_POSITIVE(is_dir(p, false));
+        ASSERT_OK_POSITIVE(is_dir(p, true));
         ASSERT_OK_ERRNO(stat(p, &st));
         ASSERT_EQ(st.st_mtim.tv_sec, 2);
         ASSERT_EQ(st.st_atim.tv_sec, 2);
@@ -156,8 +155,8 @@ TEST(mkdir_p_root_full) {
         p = mfree(p);
         ASSERT_NOT_NULL((p = path_join(tmp, "dir-not-exists/foo")));
         ASSERT_OK(mkdir_p_root_full(NULL, p, UID_INVALID, GID_INVALID, 0755, 90 * USEC_PER_HOUR, NULL));
-        ASSERT_GT(is_dir(p, false), 0);
-        ASSERT_GT(is_dir(p, true), 0);
+        ASSERT_OK_POSITIVE(is_dir(p, false));
+        ASSERT_OK_POSITIVE(is_dir(p, true));
         p = mfree(p);
         ASSERT_NOT_NULL((p = path_join(tmp, "dir-not-exists")));
         ASSERT_OK_ERRNO(stat(p, &st));