Prep v239: Uncomment header inclusions that are new or needed now.

[elogind.git] / src / test / test-conf-files.c

diff --git a/src/test/test-conf-files.c b/src/test/test-conf-files.c
index de91efac7218015837973c89722c50e7afe9ba8e..2ec2dfc26154c72d4815fe50f2e6394a586c5281 100644 (file)
--- a/src/test/test-conf-files.c
+++ b/src/test/test-conf-files.c
@@ -1,21 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
-  Copyright 2014 Michael Marineau
-
-  systemd is free software; you can redistribute it and/or modify it
-  under the terms of the GNU Lesser General Public License as published by
-  the Free Software Foundation; either version 2.1 of the License, or
-  (at your option) any later version.
-
-  systemd is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  Lesser General Public License for more details.
-
-  You should have received a copy of the GNU Lesser General Public License
-  along with systemd; If not, see <http://www.gnu.org/licenses/>.
+  Copyright © 2014 Michael Marineau
 ***/
 
 #include <stdarg.h>
@@ -23,8 +8,10 @@
 
 #include "alloc-util.h"
 #include "conf-files.h"
+#include "fileio.h"
 #include "fs-util.h"
 #include "macro.h"
+#include "mkdir.h"
 #include "parse-util.h"
 #include "rm-rf.h"
 #include "string-util.h"
@@ -35,12 +22,16 @@
 static void setup_test_dir(char *tmp_dir, const char *files, ...) {
         va_list ap;
 
-        assert_se(mkdtemp(tmp_dir) != NULL);
+        assert_se(mkdtemp(tmp_dir));
 
         va_start(ap, files);
-        while (files != NULL) {
-                _cleanup_free_ char *path = strappend(tmp_dir, files);
-                assert_se(touch_file(path, true, USEC_INFINITY, UID_INVALID, GID_INVALID, MODE_INVALID) == 0);
+        while (files) {
+                _cleanup_free_ char *path;
+
+                assert_se(path = strappend(tmp_dir, files));
+                (void) mkdir_parents(path, 0755);
+                assert_se(write_string_file(path, "foobar", WRITE_STRING_FILE_CREATE) >= 0);
+
                 files = va_arg(ap, const char *);
         }
         va_end(ap);
@@ -49,7 +40,7 @@ static void setup_test_dir(char *tmp_dir, const char *files, ...) {
 static void test_conf_files_list(bool use_root) {
         char tmp_dir[] = "/tmp/test-conf-files-XXXXXX";
         _cleanup_strv_free_ char **found_files = NULL, **found_files2 = NULL;
-        const char *root_dir, *search_1, *search_2, *expect_a, *expect_b, *expect_c;
+        const char *root_dir, *search_1, *search_2, *expect_a, *expect_b, *expect_c, *mask;
 
         log_debug("/* %s */", __func__);
 
@@ -58,8 +49,12 @@ static void test_conf_files_list(bool use_root) {
                        "/dir2/a.conf",
                        "/dir2/b.conf",
                        "/dir2/c.foo",
+                       "/dir2/d.conf",
                        NULL);
 
+        mask = strjoina(tmp_dir, "/dir1/d.conf");
+        assert_se(symlink("/dev/null", mask) >= 0);
+
         if (use_root) {
                 root_dir = tmp_dir;
                 search_1 = "/dir1";
@@ -76,23 +71,23 @@ static void test_conf_files_list(bool use_root) {
 
         log_debug("/* Check when filtered by suffix */");
 
-        assert_se(conf_files_list(&found_files, ".conf", root_dir, 0, search_1, search_2, NULL) == 0);
+        assert_se(conf_files_list(&found_files, ".conf", root_dir, CONF_FILES_FILTER_MASKED, search_1, search_2, NULL) == 0);
         strv_print(found_files);
 
         assert_se(found_files);
         assert_se(streq_ptr(found_files[0], expect_a));
         assert_se(streq_ptr(found_files[1], expect_b));
-        assert_se(found_files[2] == NULL);
+        assert_se(!found_files[2]);
 
         log_debug("/* Check when unfiltered */");
-        assert_se(conf_files_list(&found_files2, NULL, root_dir, 0, search_1, search_2, NULL) == 0);
+        assert_se(conf_files_list(&found_files2, NULL, root_dir, CONF_FILES_FILTER_MASKED, search_1, search_2, NULL) == 0);
         strv_print(found_files2);
 
         assert_se(found_files2);
         assert_se(streq_ptr(found_files2[0], expect_a));
         assert_se(streq_ptr(found_files2[1], expect_b));
         assert_se(streq_ptr(found_files2[2], expect_c));
-        assert_se(found_files2[3] == NULL);
+        assert_se(!found_files2[3]);
 
         assert_se(rm_rf(tmp_dir, REMOVE_ROOT|REMOVE_PHYSICAL) == 0);
 }