chiark / gitweb /
~ianmdlvl / elogind.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
test-cap-list: allow mismatch in case
[elogind.git] / src / test / test-unit-file.c
diff --git a/src/test/test-unit-file.c b/src/test/test-unit-file.c
index 63a8a7d076a397b98213a28c62ec2583e46c0947..08da2ba4eb4f878459629181056e5fda357580fd 100644 (file)
--- a/src/test/test-unit-file.c
+++ b/src/test/test-unit-file.c
@@ -44,10 +44,16 @@ static int test_unit_file_get_set(void) {
         Iterator i;
         UnitFileList *p;
 
-        h = hashmap_new(string_hash_func, string_compare_func);
-        assert(h);
+        h = hashmap_new(&string_hash_ops);
+        assert_se(h);
 
         r = unit_file_get_list(UNIT_FILE_SYSTEM, NULL, h);
+
+        if (r == -EPERM || r == -EACCES) {
+                printf("Skipping test: unit_file_get_list: %s", strerror(-r));
+                return EXIT_TEST_SKIP;
+        }
+
         log_full(r == 0 ? LOG_INFO : LOG_ERR,
                  "unit_file_get_list: %s", strerror(-r));
         if (r < 0)
@@ -65,6 +71,7 @@ static void check_execcommand(ExecCommand *c,
                               const char* path,
                               const char* argv0,
                               const char* argv1,
+                              const char* argv2,
                               bool ignore) {
         assert_se(c);
         log_info("%s %s %s %s",
@@ -72,7 +79,7 @@ static void check_execcommand(ExecCommand *c,
         assert_se(streq(c->path, path));
         assert_se(streq(c->argv[0], argv0));
         assert_se(streq(c->argv[1], argv1));
-        assert_se(c->argv[2] == NULL);
+        assert_se(streq_ptr(c->argv[2], argv2));
         assert_se(c->ignore == ignore);
 }
 
@@ -96,7 +103,7 @@ static void test_config_parse_exec(void) {
                               "LValue", 0, "/RValue r1",
                               &c, NULL);
         assert_se(r >= 0);
-        check_execcommand(c, "/RValue", "/RValue", "r1", false);
+        check_execcommand(c, "/RValue", "/RValue", "r1", NULL, false);
 
         r = config_parse_exec(NULL, "fake", 2, "section", 1,
                               "LValue", 0, "/RValue///slashes/// r1",
@@ -104,8 +111,7 @@ static void test_config_parse_exec(void) {
        /* test slashes */
         assert_se(r >= 0);
         c1 = c->command_next;
-        check_execcommand(c1, "/RValue/slashes", "/RValue///slashes///",
-                          "r1", false);
+        check_execcommand(c1, "/RValue/slashes", "/RValue///slashes///", "r1", NULL, false);
 
         /* honour_argv0 */
         r = config_parse_exec(NULL, "fake", 3, "section", 1,
@@ -113,7 +119,7 @@ static void test_config_parse_exec(void) {
                               &c, NULL);
         assert_se(r >= 0);
         c1 = c1->command_next;
-        check_execcommand(c1, "/RValue/slashes2", "argv0", "r1", false);
+        check_execcommand(c1, "/RValue/slashes2", "argv0", "r1", NULL, false);
 
         /* ignore && honour_argv0 */
         r = config_parse_exec(NULL, "fake", 4, "section", 1,
@@ -121,8 +127,7 @@ static void test_config_parse_exec(void) {
                               &c, NULL);
         assert_se(r >= 0);
         c1 = c1->command_next;
-        check_execcommand(c1,
-                          "/RValue/slashes3", "argv0a", "r1", true);
+        check_execcommand(c1, "/RValue/slashes3", "argv0a", "r1", NULL, true);
 
         /* ignore && honour_argv0 */
         r = config_parse_exec(NULL, "fake", 4, "section", 1,
@@ -130,8 +135,7 @@ static void test_config_parse_exec(void) {
                               &c, NULL);
         assert_se(r >= 0);
         c1 = c1->command_next;
-        check_execcommand(c1,
-                          "/RValue/slashes4", "argv0b", "r1", true);
+        check_execcommand(c1, "/RValue/slashes4", "argv0b", "r1", NULL, true);
 
         /* ignore && ignore */
         r = config_parse_exec(NULL, "fake", 4, "section", 1,
@@ -155,12 +159,10 @@ static void test_config_parse_exec(void) {
                               &c, NULL);
         assert_se(r >= 0);
         c1 = c1->command_next;
-        check_execcommand(c1,
-                          "/RValue", "argv0", "r1", true);
+        check_execcommand(c1, "/RValue", "argv0", "r1", NULL, true);
 
         c1 = c1->command_next;
-        check_execcommand(c1,
-                          "/goo/goo", "/goo/goo", "boo", false);
+        check_execcommand(c1, "/goo/goo", "/goo/goo", "boo", NULL, false);
 
         /* trailing semicolon */
         r = config_parse_exec(NULL, "fake", 5, "section", 1,
@@ -169,20 +171,28 @@ static void test_config_parse_exec(void) {
                               &c, NULL);
         assert_se(r >= 0);
         c1 = c1->command_next;
-        check_execcommand(c1,
-                          "/RValue", "argv0", "r1", true);
+        check_execcommand(c1, "/RValue", "argv0", "r1", NULL, true);
 
         assert_se(c1->command_next == NULL);
 
         /* escaped semicolon */
         r = config_parse_exec(NULL, "fake", 5, "section", 1,
                               "LValue", 0,
-                              "/usr/bin/find \\;",
+                              "/bin/find \\;",
+                              &c, NULL);
+        assert_se(r >= 0);
+        c1 = c1->command_next;
+        check_execcommand(c1, "/bin/find", "/bin/find", ";", NULL, false);
+
+        /* escaped semicolon with following arg */
+        r = config_parse_exec(NULL, "fake", 5, "section", 1,
+                              "LValue", 0,
+                              "/sbin/find \\; x",
                               &c, NULL);
         assert_se(r >= 0);
         c1 = c1->command_next;
         check_execcommand(c1,
-                          "/usr/bin/find", "/usr/bin/find", ";", false);
+                          "/sbin/find", "/sbin/find", ";", "x", false);
 
         exec_command_free_list(c);
 }
@@ -216,6 +226,9 @@ static void test_config_parse_exec(void) {
        "MODULE_0=coretemp\n" \
        "MODULE_1=f71882fg"
 
+#define env_file_5                              \
+        "a=\n"                                 \
+        "b="
 
 static void test_load_env_file_1(void) {
         _cleanup_strv_free_ char **data = NULL;
@@ -225,18 +238,18 @@ static void test_load_env_file_1(void) {
         _cleanup_close_ int fd;
 
         fd = mkostemp_safe(name, O_RDWR|O_CLOEXEC);
-        assert(fd >= 0);
+        assert_se(fd >= 0);
         assert_se(write(fd, env_file_1, sizeof(env_file_1)) == sizeof(env_file_1));
 
-        r = load_env_file(name, NULL, &data);
-        assert(r == 0);
-        assert(streq(data[0], "a=a"));
-        assert(streq(data[1], "b=bc"));
-        assert(streq(data[2], "d=def"));
-        assert(streq(data[3], "g=g "));
-        assert(streq(data[4], "h=h"));
-        assert(streq(data[5], "i=i"));
-        assert(data[6] == NULL);
+        r = load_env_file(NULL, name, NULL, &data);
+        assert_se(r == 0);
+        assert_se(streq(data[0], "a=a"));
+        assert_se(streq(data[1], "b=bc"));
+        assert_se(streq(data[2], "d=def"));
+        assert_se(streq(data[3], "g=g "));
+        assert_se(streq(data[4], "h=h"));
+        assert_se(streq(data[5], "i=i"));
+        assert_se(data[6] == NULL);
         unlink(name);
 }
 
@@ -248,13 +261,13 @@ static void test_load_env_file_2(void) {
         _cleanup_close_ int fd;
 
         fd = mkostemp_safe(name, O_RDWR|O_CLOEXEC);
-        assert(fd >= 0);
+        assert_se(fd >= 0);
         assert_se(write(fd, env_file_2, sizeof(env_file_2)) == sizeof(env_file_2));
 
-        r = load_env_file(name, NULL, &data);
-        assert(r == 0);
-        assert(streq(data[0], "a=a"));
-        assert(data[1] == NULL);
+        r = load_env_file(NULL, name, NULL, &data);
+        assert_se(r == 0);
+        assert_se(streq(data[0], "a=a"));
+        assert_se(data[1] == NULL);
         unlink(name);
 }
 
@@ -266,12 +279,12 @@ static void test_load_env_file_3(void) {
         _cleanup_close_ int fd;
 
         fd = mkostemp_safe(name, O_RDWR|O_CLOEXEC);
-        assert(fd >= 0);
+        assert_se(fd >= 0);
         assert_se(write(fd, env_file_3, sizeof(env_file_3)) == sizeof(env_file_3));
 
-        r = load_env_file(name, NULL, &data);
-        assert(r == 0);
-        assert(data == NULL);
+        r = load_env_file(NULL, name, NULL, &data);
+        assert_se(r == 0);
+        assert_se(data == NULL);
         unlink(name);
 }
 
@@ -282,18 +295,36 @@ static void test_load_env_file_4(void) {
         int r;
 
         fd = mkostemp_safe(name, O_RDWR|O_CLOEXEC);
-        assert(fd >= 0);
+        assert_se(fd >= 0);
         assert_se(write(fd, env_file_4, sizeof(env_file_4)) == sizeof(env_file_4));
 
-        r = load_env_file(name, NULL, &data);
-        assert(r == 0);
-        assert(streq(data[0], "HWMON_MODULES=coretemp f71882fg"));
-        assert(streq(data[1], "MODULE_0=coretemp"));
-        assert(streq(data[2], "MODULE_1=f71882fg"));
-        assert(data[3] == NULL);
+        r = load_env_file(NULL, name, NULL, &data);
+        assert_se(r == 0);
+        assert_se(streq(data[0], "HWMON_MODULES=coretemp f71882fg"));
+        assert_se(streq(data[1], "MODULE_0=coretemp"));
+        assert_se(streq(data[2], "MODULE_1=f71882fg"));
+        assert_se(data[3] == NULL);
         unlink(name);
 }
 
+static void test_load_env_file_5(void) {
+        _cleanup_strv_free_ char **data = NULL;
+        int r;
+
+        char name[] = "/tmp/test-load-env-file.XXXXXX";
+        _cleanup_close_ int fd;
+
+        fd = mkostemp_safe(name, O_RDWR|O_CLOEXEC);
+        assert_se(fd >= 0);
+        assert_se(write(fd, env_file_5, sizeof(env_file_5)) == sizeof(env_file_5));
+
+        r = load_env_file(NULL, name, NULL, &data);
+        assert_se(r == 0);
+        assert_se(streq(data[0], "a="));
+        assert_se(streq(data[1], "b="));
+        assert_se(data[2] == NULL);
+        unlink(name);
+}
 
 static void test_install_printf(void) {
         char    name[] = "name.service",
@@ -323,11 +354,11 @@ static void test_install_printf(void) {
                 memzero(i.name, strlen(i.name));                        \
                 memzero(i.path, strlen(i.path));                        \
                 memzero(i.user, strlen(i.user));                        \
-                assert(d1 && d2 && d3);                                 \
+                assert_se(d1 && d2 && d3);                                 \
                 if (result) {                                           \
                         printf("%s\n", t);                              \
-                        assert(streq(t, result));                       \
-                } else assert(t == NULL);                               \
+                        assert_se(streq(t, result));                       \
+                } else assert_se(t == NULL);                               \
                 strcpy(i.name, d1);                                     \
                 strcpy(i.path, d2);                                     \
                 strcpy(i.user, d3);                                     \
@@ -381,6 +412,7 @@ int main(int argc, char *argv[]) {
         test_load_env_file_2();
         test_load_env_file_3();
         test_load_env_file_4();
+        test_load_env_file_5();
         TEST_REQ_RUNNING_SYSTEMD(test_install_printf());
 
         return r;
Unnamed repository; edit this file 'description' to name the repository.