]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
test: move several test cases to test-env-file.c
authorYu Watanabe <watanabe.yu+github@gmail.com>
Wed, 12 Nov 2025 22:45:08 +0000 (07:45 +0900)
committerYu Watanabe <watanabe.yu+github@gmail.com>
Thu, 13 Nov 2025 00:19:56 +0000 (09:19 +0900)
src/test/test-env-file.c
src/test/test-fileio.c

index 812c0cb762c02b296d222e61eb1bf0746ce2df1a..a21cec5e77a63aa9db85feccd286c2f5c947ec7d 100644 (file)
@@ -1,6 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include "env-file.h"
+#include "env-util.h"
 #include "fd-util.h"
 #include "fileio.h"
 #include "fs-util.h"
@@ -187,4 +188,315 @@ TEST(write_and_load_env_file) {
         }
 }
 
+TEST(parse_env_file) {
+        _cleanup_(unlink_tempfilep) char
+                t[] = "/tmp/test-fileio-in-XXXXXX",
+                p[] = "/tmp/test-fileio-out-XXXXXX";
+        FILE *f;
+        _cleanup_free_ char *one = NULL, *two = NULL, *three = NULL, *four = NULL, *five = NULL,
+                        *six = NULL, *seven = NULL, *eight = NULL, *nine = NULL, *ten = NULL,
+                        *eleven = NULL, *twelve = NULL, *thirteen = NULL;
+        _cleanup_strv_free_ char **a = NULL, **b = NULL;
+        unsigned k;
+
+        ASSERT_OK(fmkostemp_safe(t, "w", &f));
+        fputs("one=BAR   \n"
+              "# comment\n"
+              " # comment \n"
+              " ; comment \n"
+              "  two   =   bar    \n"
+              "invalid line\n"
+              "invalid line #comment\n"
+              "three = \"333\n"
+              "xxxx\"\n"
+              "four = \'44\\\"44\'\n"
+              "five = \"55\\\"55\" \"FIVE\" cinco   \n"
+              "six = seis sechs\\\n"
+              " sis\n"
+              "seven=\"sevenval\" #nocomment\n"
+              "eight=eightval #nocomment\n"
+              "export nine=nineval\n"
+              "ten=ignored\n"
+              "ten=ignored\n"
+              "ten=\n"
+              "eleven=\\value\n"
+              "twelve=\"\\value\"\n"
+              "thirteen='\\value'", f);
+
+        fflush(f);
+        fclose(f);
+
+        ASSERT_OK(load_env_file(NULL, t, &a));
+
+        STRV_FOREACH(i, a)
+                log_debug("Got: <%s>", *i);
+
+        ASSERT_STREQ(a[0], "one=BAR");
+        ASSERT_STREQ(a[1], "two=bar");
+        ASSERT_STREQ(a[2], "three=333\nxxxx");
+        ASSERT_STREQ(a[3], "four=44\\\"44");
+        ASSERT_STREQ(a[4], "five=55\"55FIVEcinco");
+        ASSERT_STREQ(a[5], "six=seis sechs sis");
+        ASSERT_STREQ(a[6], "seven=sevenval#nocomment");
+        ASSERT_STREQ(a[7], "eight=eightval #nocomment");
+        ASSERT_STREQ(a[8], "export nine=nineval");
+        ASSERT_STREQ(a[9], "ten=");
+        ASSERT_STREQ(a[10], "eleven=value");
+        ASSERT_STREQ(a[11], "twelve=\\value");
+        ASSERT_STREQ(a[12], "thirteen=\\value");
+        ASSERT_NULL(a[13]);
+
+        strv_env_clean(a);
+
+        k = 0;
+        STRV_FOREACH(i, b) {
+                log_debug("Got2: <%s>", *i);
+                ASSERT_STREQ(*i, a[k++]);
+        }
+
+        ASSERT_OK(parse_env_file(NULL, t,
+                                 "one", &one,
+                                 "two", &two,
+                                 "three", &three,
+                                 "four", &four,
+                                 "five", &five,
+                                 "six", &six,
+                                 "seven", &seven,
+                                 "eight", &eight,
+                                 "export nine", &nine,
+                                 "ten", &ten,
+                                 "eleven", &eleven,
+                                 "twelve", &twelve,
+                                 "thirteen", &thirteen));
+
+        log_debug("one=[%s]", strna(one));
+        log_debug("two=[%s]", strna(two));
+        log_debug("three=[%s]", strna(three));
+        log_debug("four=[%s]", strna(four));
+        log_debug("five=[%s]", strna(five));
+        log_debug("six=[%s]", strna(six));
+        log_debug("seven=[%s]", strna(seven));
+        log_debug("eight=[%s]", strna(eight));
+        log_debug("export nine=[%s]", strna(nine));
+        log_debug("ten=[%s]", strna(nine));
+        log_debug("eleven=[%s]", strna(eleven));
+        log_debug("twelve=[%s]", strna(twelve));
+        log_debug("thirteen=[%s]", strna(thirteen));
+
+        ASSERT_STREQ(one, "BAR");
+        ASSERT_STREQ(two, "bar");
+        ASSERT_STREQ(three, "333\nxxxx");
+        ASSERT_STREQ(four, "44\\\"44");
+        ASSERT_STREQ(five, "55\"55FIVEcinco");
+        ASSERT_STREQ(six, "seis sechs sis");
+        ASSERT_STREQ(seven, "sevenval#nocomment");
+        ASSERT_STREQ(eight, "eightval #nocomment");
+        ASSERT_STREQ(nine, "nineval");
+        ASSERT_NULL(ten);
+        ASSERT_STREQ(eleven, "value");
+        ASSERT_STREQ(twelve, "\\value");
+        ASSERT_STREQ(thirteen, "\\value");
+
+        /* prepare a temporary file to write the environment to */
+        _cleanup_close_ int fd = -EBADF;
+        ASSERT_OK(fd = mkostemp_safe(p));
+
+        ASSERT_OK(write_env_file(AT_FDCWD, p, /* headers= */ NULL, a, /* flags= */ 0));
+        ASSERT_OK(load_env_file(NULL, p, &b));
+}
+
+static void test_one_shell_var(const char *file, const char *variable, const char *value) {
+        _cleanup_free_ char *cmd = NULL, *from_shell = NULL;
+        _cleanup_pclose_ FILE *f = NULL;
+        size_t sz;
+
+        ASSERT_NOT_NULL(cmd = strjoin(". ", file, " && /bin/echo -n \"$", variable, "\""));
+        ASSERT_NOT_NULL(f = popen(cmd, "re"));
+        ASSERT_OK(read_full_stream(f, &from_shell, &sz));
+        ASSERT_EQ(sz, strlen(value));
+        ASSERT_STREQ(from_shell, value);
+}
+
+TEST(parse_multiline_env_file) {
+        _cleanup_(unlink_tempfilep) char
+                t[] = "/tmp/test-fileio-in-XXXXXX",
+                p[] = "/tmp/test-fileio-out-XXXXXX";
+        FILE *f;
+        _cleanup_strv_free_ char **a = NULL, **b = NULL;
+
+        ASSERT_OK(fmkostemp_safe(t, "w", &f));
+        fputs("one=BAR\\\n"
+              "\\ \\ \\ \\ VAR\\\n"
+              "\\\tGAR\n"
+              "#comment\n"
+              "two=\"bar\\\n"
+              "    var\\\n"
+              "\tgar\"\n"
+              "#comment\n"
+              "tri=\"bar \\\n"
+              "    var \\\n"
+              "\tgar \"\n", f);
+
+        ASSERT_OK(fflush_and_check(f));
+        fclose(f);
+
+        test_one_shell_var(t, "one", "BAR    VAR\tGAR");
+        test_one_shell_var(t, "two", "bar    var\tgar");
+        test_one_shell_var(t, "tri", "bar     var \tgar ");
+
+        ASSERT_OK(load_env_file(NULL, t, &a));
+
+        STRV_FOREACH(i, a)
+                log_debug("Got: <%s>", *i);
+
+        ASSERT_STREQ(a[0], "one=BAR    VAR\tGAR");
+        ASSERT_STREQ(a[1], "two=bar    var\tgar");
+        ASSERT_STREQ(a[2], "tri=bar     var \tgar ");
+        ASSERT_NULL(a[3]);
+
+        _cleanup_close_ int fd = -EBADF;
+        ASSERT_OK(fd = mkostemp_safe(p));
+
+        ASSERT_OK(write_env_file(AT_FDCWD, p, /* headers= */ NULL, a, /* flags= */ 0));
+        ASSERT_OK(load_env_file(NULL, p, &b));
+}
+
+TEST(merge_env_file) {
+        _cleanup_(unlink_tempfilep) char t[] = "/tmp/test-fileio-XXXXXX";
+        _cleanup_fclose_ FILE *f = NULL;
+        _cleanup_strv_free_ char **a = NULL;
+
+        ASSERT_OK(fmkostemp_safe(t, "w", &f));
+
+        ASSERT_OK(write_string_stream(f,
+                                      "one=1   \n"
+                                      "twelve=${one}2\n"
+                                      "twentyone=2${one}\n"
+                                      "one=2\n"
+                                      "twentytwo=2${one}\n"
+                                      "xxx_minus_three=$xxx - 3\n"
+                                      "xxx=0x$one$one$one\n"
+                                      "yyy=${one:-fallback}\n"
+                                      "zzz=${one:+replacement}\n"
+                                      "zzzz=${foobar:-${nothing}}\n"
+                                      "zzzzz=${nothing:+${nothing}}\n"
+                                      , WRITE_STRING_FILE_AVOID_NEWLINE));
+
+        ASSERT_OK(merge_env_file(&a, NULL, t));
+        strv_sort(a);
+
+        STRV_FOREACH(i, a)
+                log_debug("Got: <%s>", *i);
+
+        ASSERT_STREQ(a[0], "one=2");
+        ASSERT_STREQ(a[1], "twelve=12");
+        ASSERT_STREQ(a[2], "twentyone=21");
+        ASSERT_STREQ(a[3], "twentytwo=22");
+        ASSERT_STREQ(a[4], "xxx=0x222");
+        ASSERT_STREQ(a[5], "xxx_minus_three= - 3");
+        ASSERT_STREQ(a[6], "yyy=2");
+        ASSERT_STREQ(a[7], "zzz=replacement");
+        ASSERT_STREQ(a[8], "zzzz=");
+        ASSERT_STREQ(a[9], "zzzzz=");
+        ASSERT_NULL(a[10]);
+
+        ASSERT_OK(merge_env_file(&a, NULL, t));
+        strv_sort(a);
+
+        STRV_FOREACH(i, a)
+                log_debug("Got2: <%s>", *i);
+
+        ASSERT_STREQ(a[0], "one=2");
+        ASSERT_STREQ(a[1], "twelve=12");
+        ASSERT_STREQ(a[2], "twentyone=21");
+        ASSERT_STREQ(a[3], "twentytwo=22");
+        ASSERT_STREQ(a[4], "xxx=0x222");
+        ASSERT_STREQ(a[5], "xxx_minus_three=0x222 - 3");
+        ASSERT_STREQ(a[6], "yyy=2");
+        ASSERT_STREQ(a[7], "zzz=replacement");
+        ASSERT_STREQ(a[8], "zzzz=");
+        ASSERT_STREQ(a[9], "zzzzz=");
+        ASSERT_NULL(a[10]);
+}
+
+TEST(merge_env_file_invalid) {
+        _cleanup_(unlink_tempfilep) char t[] = "/tmp/test-fileio-XXXXXX";
+        _cleanup_fclose_ FILE *f = NULL;
+        _cleanup_strv_free_ char **a = NULL;
+
+        ASSERT_OK(fmkostemp_safe(t, "w", &f));
+
+        ASSERT_OK(write_string_stream(f,
+                                      "unset one   \n"
+                                      "unset one=   \n"
+                                      "unset one=1   \n"
+                                      "one   \n"
+                                      "one =  \n"
+                                      "one two =\n"
+                                      "\x20two=\n"
+                                      "#comment=comment\n"
+                                      ";comment2=comment2\n"
+                                      "#\n"
+                                      "\n\n"                  /* empty line */
+                                      , WRITE_STRING_FILE_AVOID_NEWLINE));
+
+        ASSERT_OK(merge_env_file(&a, NULL, t));
+
+        STRV_FOREACH(i, a)
+                log_debug("Got: <%s>", *i);
+
+        ASSERT_TRUE(strv_isempty(a));
+}
+
+static void check_file_pairs_one(char **l) {
+        ASSERT_EQ(strv_length(l), 14U);
+
+        STRV_FOREACH_PAIR(k, v, l) {
+                if (streq(*k, "NAME"))
+                        ASSERT_STREQ(*v, "Arch Linux");
+                else if (streq(*k, "ID"))
+                        ASSERT_STREQ(*v, "arch");
+                else if (streq(*k, "PRETTY_NAME"))
+                        ASSERT_STREQ(*v, "Arch Linux");
+                else if (streq(*k, "ANSI_COLOR"))
+                        ASSERT_STREQ(*v, "0;36");
+                else if (streq(*k, "HOME_URL"))
+                        ASSERT_STREQ(*v, "https://www.archlinux.org/");
+                else if (streq(*k, "SUPPORT_URL"))
+                        ASSERT_STREQ(*v, "https://bbs.archlinux.org/");
+                else if (streq(*k, "BUG_REPORT_URL"))
+                        ASSERT_STREQ(*v, "https://bugs.archlinux.org/");
+                else
+                        assert_not_reached();
+        }
+}
+
+TEST(load_env_file_pairs) {
+        _cleanup_(unlink_tempfilep) char fn[] = "/tmp/test-load_env_file_pairs-XXXXXX";
+        _cleanup_fclose_ FILE *f = NULL;
+        _cleanup_strv_free_ char **l = NULL;
+        int fd;
+
+        ASSERT_OK(fd = mkostemp_safe(fn));
+
+        ASSERT_OK(write_string_file(fn,
+                                    "NAME=\"Arch Linux\"\n"
+                                    "ID=arch\n"
+                                    "PRETTY_NAME=\"Arch Linux\"\n"
+                                    "ANSI_COLOR=\"0;36\"\n"
+                                    "HOME_URL=\"https://www.archlinux.org/\"\n"
+                                    "SUPPORT_URL=\"https://bbs.archlinux.org/\"\n"
+                                    "BUG_REPORT_URL=\"https://bugs.archlinux.org/\"\n"
+                                    , WRITE_STRING_FILE_CREATE));
+
+        ASSERT_OK(load_env_file_pairs_fd(fd, fn, &l));
+        check_file_pairs_one(l);
+        l = strv_free(l);
+
+        ASSERT_NOT_NULL(f = fdopen(fd, "r"));
+
+        ASSERT_OK(load_env_file_pairs(f, fn, &l));
+        check_file_pairs_one(l);
+}
+
 DEFINE_TEST_MAIN(LOG_INFO);
index 989d9eab88a2c5eaacded52e4e6b96a44a004e9e..0c9346ff64fcd6981f664fce5ae0379fbe4bb571 100644 (file)
@@ -5,13 +5,10 @@
 #include <unistd.h>
 
 #include "alloc-util.h"
-#include "env-file.h"
-#include "env-util.h"
 #include "errno-util.h"
 #include "fd-util.h"
 #include "fileio.h"
 #include "fs-util.h"
-#include "iovec-util.h"
 #include "memfd-util.h"
 #include "parse-util.h"
 #include "path-util.h"
 #include "tests.h"
 #include "tmpfile-util.h"
 
-TEST(parse_env_file) {
-        _cleanup_(unlink_tempfilep) char
-                t[] = "/tmp/test-fileio-in-XXXXXX",
-                p[] = "/tmp/test-fileio-out-XXXXXX";
-        FILE *f;
-        _cleanup_free_ char *one = NULL, *two = NULL, *three = NULL, *four = NULL, *five = NULL,
-                        *six = NULL, *seven = NULL, *eight = NULL, *nine = NULL, *ten = NULL,
-                        *eleven = NULL, *twelve = NULL, *thirteen = NULL;
-        _cleanup_strv_free_ char **a = NULL, **b = NULL;
-        unsigned k;
-
-        ASSERT_OK(fmkostemp_safe(t, "w", &f));
-        fputs("one=BAR   \n"
-              "# comment\n"
-              " # comment \n"
-              " ; comment \n"
-              "  two   =   bar    \n"
-              "invalid line\n"
-              "invalid line #comment\n"
-              "three = \"333\n"
-              "xxxx\"\n"
-              "four = \'44\\\"44\'\n"
-              "five = \"55\\\"55\" \"FIVE\" cinco   \n"
-              "six = seis sechs\\\n"
-              " sis\n"
-              "seven=\"sevenval\" #nocomment\n"
-              "eight=eightval #nocomment\n"
-              "export nine=nineval\n"
-              "ten=ignored\n"
-              "ten=ignored\n"
-              "ten=\n"
-              "eleven=\\value\n"
-              "twelve=\"\\value\"\n"
-              "thirteen='\\value'", f);
-
-        fflush(f);
-        fclose(f);
-
-        ASSERT_OK(load_env_file(NULL, t, &a));
-
-        STRV_FOREACH(i, a)
-                log_debug("Got: <%s>", *i);
-
-        ASSERT_STREQ(a[0], "one=BAR");
-        ASSERT_STREQ(a[1], "two=bar");
-        ASSERT_STREQ(a[2], "three=333\nxxxx");
-        ASSERT_STREQ(a[3], "four=44\\\"44");
-        ASSERT_STREQ(a[4], "five=55\"55FIVEcinco");
-        ASSERT_STREQ(a[5], "six=seis sechs sis");
-        ASSERT_STREQ(a[6], "seven=sevenval#nocomment");
-        ASSERT_STREQ(a[7], "eight=eightval #nocomment");
-        ASSERT_STREQ(a[8], "export nine=nineval");
-        ASSERT_STREQ(a[9], "ten=");
-        ASSERT_STREQ(a[10], "eleven=value");
-        ASSERT_STREQ(a[11], "twelve=\\value");
-        ASSERT_STREQ(a[12], "thirteen=\\value");
-        ASSERT_NULL(a[13]);
-
-        strv_env_clean(a);
-
-        k = 0;
-        STRV_FOREACH(i, b) {
-                log_debug("Got2: <%s>", *i);
-                ASSERT_STREQ(*i, a[k++]);
-        }
-
-        ASSERT_OK(parse_env_file(NULL, t,
-                                 "one", &one,
-                                 "two", &two,
-                                 "three", &three,
-                                 "four", &four,
-                                 "five", &five,
-                                 "six", &six,
-                                 "seven", &seven,
-                                 "eight", &eight,
-                                 "export nine", &nine,
-                                 "ten", &ten,
-                                 "eleven", &eleven,
-                                 "twelve", &twelve,
-                                 "thirteen", &thirteen));
-
-        log_debug("one=[%s]", strna(one));
-        log_debug("two=[%s]", strna(two));
-        log_debug("three=[%s]", strna(three));
-        log_debug("four=[%s]", strna(four));
-        log_debug("five=[%s]", strna(five));
-        log_debug("six=[%s]", strna(six));
-        log_debug("seven=[%s]", strna(seven));
-        log_debug("eight=[%s]", strna(eight));
-        log_debug("export nine=[%s]", strna(nine));
-        log_debug("ten=[%s]", strna(nine));
-        log_debug("eleven=[%s]", strna(eleven));
-        log_debug("twelve=[%s]", strna(twelve));
-        log_debug("thirteen=[%s]", strna(thirteen));
-
-        ASSERT_STREQ(one, "BAR");
-        ASSERT_STREQ(two, "bar");
-        ASSERT_STREQ(three, "333\nxxxx");
-        ASSERT_STREQ(four, "44\\\"44");
-        ASSERT_STREQ(five, "55\"55FIVEcinco");
-        ASSERT_STREQ(six, "seis sechs sis");
-        ASSERT_STREQ(seven, "sevenval#nocomment");
-        ASSERT_STREQ(eight, "eightval #nocomment");
-        ASSERT_STREQ(nine, "nineval");
-        ASSERT_NULL(ten);
-        ASSERT_STREQ(eleven, "value");
-        ASSERT_STREQ(twelve, "\\value");
-        ASSERT_STREQ(thirteen, "\\value");
-
-        /* prepare a temporary file to write the environment to */
-        _cleanup_close_ int fd = -EBADF;
-        ASSERT_OK(fd = mkostemp_safe(p));
-
-        ASSERT_OK(write_env_file(AT_FDCWD, p, /* headers= */ NULL, a, /* flags= */ 0));
-        ASSERT_OK(load_env_file(NULL, p, &b));
-}
-
-static void test_one_shell_var(const char *file, const char *variable, const char *value) {
-        _cleanup_free_ char *cmd = NULL, *from_shell = NULL;
-        _cleanup_pclose_ FILE *f = NULL;
-        size_t sz;
-
-        ASSERT_NOT_NULL(cmd = strjoin(". ", file, " && /bin/echo -n \"$", variable, "\""));
-        ASSERT_NOT_NULL(f = popen(cmd, "re"));
-        ASSERT_OK(read_full_stream(f, &from_shell, &sz));
-        ASSERT_EQ(sz, strlen(value));
-        ASSERT_STREQ(from_shell, value);
-}
-
-TEST(parse_multiline_env_file) {
-        _cleanup_(unlink_tempfilep) char
-                t[] = "/tmp/test-fileio-in-XXXXXX",
-                p[] = "/tmp/test-fileio-out-XXXXXX";
-        FILE *f;
-        _cleanup_strv_free_ char **a = NULL, **b = NULL;
-
-        ASSERT_OK(fmkostemp_safe(t, "w", &f));
-        fputs("one=BAR\\\n"
-              "\\ \\ \\ \\ VAR\\\n"
-              "\\\tGAR\n"
-              "#comment\n"
-              "two=\"bar\\\n"
-              "    var\\\n"
-              "\tgar\"\n"
-              "#comment\n"
-              "tri=\"bar \\\n"
-              "    var \\\n"
-              "\tgar \"\n", f);
-
-        ASSERT_OK(fflush_and_check(f));
-        fclose(f);
-
-        test_one_shell_var(t, "one", "BAR    VAR\tGAR");
-        test_one_shell_var(t, "two", "bar    var\tgar");
-        test_one_shell_var(t, "tri", "bar     var \tgar ");
-
-        ASSERT_OK(load_env_file(NULL, t, &a));
-
-        STRV_FOREACH(i, a)
-                log_debug("Got: <%s>", *i);
-
-        ASSERT_STREQ(a[0], "one=BAR    VAR\tGAR");
-        ASSERT_STREQ(a[1], "two=bar    var\tgar");
-        ASSERT_STREQ(a[2], "tri=bar     var \tgar ");
-        ASSERT_NULL(a[3]);
-
-        _cleanup_close_ int fd = -EBADF;
-        ASSERT_OK(fd = mkostemp_safe(p));
-
-        ASSERT_OK(write_env_file(AT_FDCWD, p, /* headers= */ NULL, a, /* flags= */ 0));
-        ASSERT_OK(load_env_file(NULL, p, &b));
-}
-
-TEST(merge_env_file) {
-        _cleanup_(unlink_tempfilep) char t[] = "/tmp/test-fileio-XXXXXX";
-        _cleanup_fclose_ FILE *f = NULL;
-        _cleanup_strv_free_ char **a = NULL;
-
-        ASSERT_OK(fmkostemp_safe(t, "w", &f));
-
-        ASSERT_OK(write_string_stream(f,
-                                      "one=1   \n"
-                                      "twelve=${one}2\n"
-                                      "twentyone=2${one}\n"
-                                      "one=2\n"
-                                      "twentytwo=2${one}\n"
-                                      "xxx_minus_three=$xxx - 3\n"
-                                      "xxx=0x$one$one$one\n"
-                                      "yyy=${one:-fallback}\n"
-                                      "zzz=${one:+replacement}\n"
-                                      "zzzz=${foobar:-${nothing}}\n"
-                                      "zzzzz=${nothing:+${nothing}}\n"
-                                      , WRITE_STRING_FILE_AVOID_NEWLINE));
-
-        ASSERT_OK(merge_env_file(&a, NULL, t));
-        strv_sort(a);
-
-        STRV_FOREACH(i, a)
-                log_debug("Got: <%s>", *i);
-
-        ASSERT_STREQ(a[0], "one=2");
-        ASSERT_STREQ(a[1], "twelve=12");
-        ASSERT_STREQ(a[2], "twentyone=21");
-        ASSERT_STREQ(a[3], "twentytwo=22");
-        ASSERT_STREQ(a[4], "xxx=0x222");
-        ASSERT_STREQ(a[5], "xxx_minus_three= - 3");
-        ASSERT_STREQ(a[6], "yyy=2");
-        ASSERT_STREQ(a[7], "zzz=replacement");
-        ASSERT_STREQ(a[8], "zzzz=");
-        ASSERT_STREQ(a[9], "zzzzz=");
-        ASSERT_NULL(a[10]);
-
-        ASSERT_OK(merge_env_file(&a, NULL, t));
-        strv_sort(a);
-
-        STRV_FOREACH(i, a)
-                log_debug("Got2: <%s>", *i);
-
-        ASSERT_STREQ(a[0], "one=2");
-        ASSERT_STREQ(a[1], "twelve=12");
-        ASSERT_STREQ(a[2], "twentyone=21");
-        ASSERT_STREQ(a[3], "twentytwo=22");
-        ASSERT_STREQ(a[4], "xxx=0x222");
-        ASSERT_STREQ(a[5], "xxx_minus_three=0x222 - 3");
-        ASSERT_STREQ(a[6], "yyy=2");
-        ASSERT_STREQ(a[7], "zzz=replacement");
-        ASSERT_STREQ(a[8], "zzzz=");
-        ASSERT_STREQ(a[9], "zzzzz=");
-        ASSERT_NULL(a[10]);
-}
-
-TEST(merge_env_file_invalid) {
-        _cleanup_(unlink_tempfilep) char t[] = "/tmp/test-fileio-XXXXXX";
-        _cleanup_fclose_ FILE *f = NULL;
-        _cleanup_strv_free_ char **a = NULL;
-
-        ASSERT_OK(fmkostemp_safe(t, "w", &f));
-
-        ASSERT_OK(write_string_stream(f,
-                                      "unset one   \n"
-                                      "unset one=   \n"
-                                      "unset one=1   \n"
-                                      "one   \n"
-                                      "one =  \n"
-                                      "one two =\n"
-                                      "\x20two=\n"
-                                      "#comment=comment\n"
-                                      ";comment2=comment2\n"
-                                      "#\n"
-                                      "\n\n"                  /* empty line */
-                                      , WRITE_STRING_FILE_AVOID_NEWLINE));
-
-        ASSERT_OK(merge_env_file(&a, NULL, t));
-
-        STRV_FOREACH(i, a)
-                log_debug("Got: <%s>", *i);
-
-        ASSERT_TRUE(strv_isempty(a));
-}
-
 TEST(script_get_shebang_interpreter) {
         _cleanup_(unlink_tempfilep) char t[] = "/tmp/test-fileio-XXXXXX";
         _cleanup_fclose_ FILE *f = NULL;
@@ -438,57 +175,6 @@ TEST(write_string_file_verify) {
         ASSERT_OK(write_string_file("/proc/version", buf2, WRITE_STRING_FILE_VERIFY_ON_FAILURE|WRITE_STRING_FILE_AVOID_NEWLINE));
 }
 
-static void check_file_pairs_one(char **l) {
-        ASSERT_EQ(strv_length(l), 14U);
-
-        STRV_FOREACH_PAIR(k, v, l) {
-                if (streq(*k, "NAME"))
-                        ASSERT_STREQ(*v, "Arch Linux");
-                else if (streq(*k, "ID"))
-                        ASSERT_STREQ(*v, "arch");
-                else if (streq(*k, "PRETTY_NAME"))
-                        ASSERT_STREQ(*v, "Arch Linux");
-                else if (streq(*k, "ANSI_COLOR"))
-                        ASSERT_STREQ(*v, "0;36");
-                else if (streq(*k, "HOME_URL"))
-                        ASSERT_STREQ(*v, "https://www.archlinux.org/");
-                else if (streq(*k, "SUPPORT_URL"))
-                        ASSERT_STREQ(*v, "https://bbs.archlinux.org/");
-                else if (streq(*k, "BUG_REPORT_URL"))
-                        ASSERT_STREQ(*v, "https://bugs.archlinux.org/");
-                else
-                        assert_not_reached();
-        }
-}
-
-TEST(load_env_file_pairs) {
-        _cleanup_(unlink_tempfilep) char fn[] = "/tmp/test-load_env_file_pairs-XXXXXX";
-        _cleanup_fclose_ FILE *f = NULL;
-        _cleanup_strv_free_ char **l = NULL;
-        int fd;
-
-        ASSERT_OK(fd = mkostemp_safe(fn));
-
-        ASSERT_OK(write_string_file(fn,
-                                    "NAME=\"Arch Linux\"\n"
-                                    "ID=arch\n"
-                                    "PRETTY_NAME=\"Arch Linux\"\n"
-                                    "ANSI_COLOR=\"0;36\"\n"
-                                    "HOME_URL=\"https://www.archlinux.org/\"\n"
-                                    "SUPPORT_URL=\"https://bbs.archlinux.org/\"\n"
-                                    "BUG_REPORT_URL=\"https://bugs.archlinux.org/\"\n"
-                                    , WRITE_STRING_FILE_CREATE));
-
-        ASSERT_OK(load_env_file_pairs_fd(fd, fn, &l));
-        check_file_pairs_one(l);
-        l = strv_free(l);
-
-        ASSERT_NOT_NULL(f = fdopen(fd, "r"));
-
-        ASSERT_OK(load_env_file_pairs(f, fn, &l));
-        check_file_pairs_one(l);
-}
-
 TEST(search_and_fopen) {
         static const char* const dirs[] = {
                 "/tmp/foo/bar",