X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Ftest%2Ftest-unit-name.c;h=db728bcefb352e05925d83188c548aaf99378498;hb=b1a5a9989ada9b3738d71605f051ff393d41f2ff;hp=3c0a416dfac6d3ec78f939ac2e98541f548bf703;hpb=fa3cd7394c227ad38c5c09b2bc2d035e7fb14a76;p=elogind.git diff --git a/src/test/test-unit-name.c b/src/test/test-unit-name.c index 3c0a416df..db728bcef 100644 --- a/src/test/test-unit-name.c +++ b/src/test/test-unit-name.c @@ -5,6 +5,7 @@ Copyright 2012 Lennart Poettering Copyright 2013 Zbigniew Jędrzejewski-Szmek + Copyright 2014 Ronny Chevalier 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 @@ -34,11 +35,12 @@ #include "specifier.h" #include "util.h" #include "macro.h" +#include "test-helper.h" static void test_replacements(void) { #define expect(pattern, repl, expected) \ { \ - char _cleanup_free_ *t = \ + _cleanup_free_ char *t = \ unit_name_replace_instance(pattern, repl); \ puts(t); \ assert(streq(t, expected)); \ @@ -57,12 +59,12 @@ static void test_replacements(void) { #undef expect #define expect(path, suffix, expected) \ { \ - char _cleanup_free_ *k, *t = \ + _cleanup_free_ char *k, *t = \ unit_name_from_path(path, suffix); \ puts(t); \ k = unit_name_to_path(t); \ puts(k); \ - assert(streq(k, expected ? expected : path)); \ + assert(streq(k, expected ? expected : path)); \ } expect("/waldo", ".mount", NULL); @@ -73,12 +75,12 @@ static void test_replacements(void) { puts("-------------------------------------------------"); #undef expect -#define expect(pattern, path, suffix, expected) \ - { \ - char _cleanup_free_ *t = \ +#define expect(pattern, path, suffix, expected) \ + { \ + _cleanup_free_ char *t = \ unit_name_from_path_instance(pattern, path, suffix); \ - puts(t); \ - assert(streq(t, expected)); \ + puts(t); \ + assert(streq(t, expected)); \ } expect("waldo", "/waldo", ".mount", "waldo@waldo.mount"); @@ -88,13 +90,13 @@ static void test_replacements(void) { puts("-------------------------------------------------"); #undef expect -#define expect(pattern) \ - { \ - char _cleanup_free_ *k, *t; \ - assert_se(t = unit_name_mangle(pattern)); \ - assert_se(k = unit_name_mangle(t)); \ - puts(t); \ - assert_se(streq(t, k)); \ +#define expect(pattern) \ + { \ + _cleanup_free_ char *k, *t; \ + assert_se(t = unit_name_mangle(pattern, MANGLE_NOGLOB)); \ + assert_se(k = unit_name_mangle(t, MANGLE_NOGLOB)); \ + puts(t); \ + assert_se(streq(t, k)); \ } expect("/home"); @@ -108,28 +110,34 @@ static void test_replacements(void) { #undef expect } -static void test_unit_printf(void) { - Manager *m; +static int test_unit_printf(void) { + Manager *m = NULL; Unit *u, *u2; + int r; - char _cleanup_free_ *mid, *bid, *host, *root_uid; + _cleanup_free_ char *mid, *bid, *host, *root_uid; struct passwd *root; - assert_se((mid = specifier_machine_id('m', NULL, NULL))); - assert_se((bid = specifier_boot_id('b', NULL, NULL))); + assert_se(specifier_machine_id('m', NULL, NULL, &mid) >= 0 && mid); + assert_se(specifier_boot_id('b', NULL, NULL, &bid) >= 0 && bid); assert_se((host = gethostname_malloc())); assert_se((root = getpwnam("root"))); assert_se(asprintf(&root_uid, "%d", (int) root->pw_uid) > 0); - assert_se(manager_new(SYSTEMD_USER, &m) == 0); + r = manager_new(SYSTEMD_USER, &m); + if (r == -EPERM || r == -EACCES || r == -EADDRINUSE) { + puts("manager_new: Permission denied. Skipping test."); + return EXIT_TEST_SKIP; + } + assert(r == 0); #define expect(unit, pattern, expected) \ { \ char *e; \ - char _cleanup_free_ *t = \ - unit_full_printf(unit, pattern); \ - printf("result: %s\n", t); \ + _cleanup_free_ char *t; \ + assert_se(unit_full_printf(unit, pattern, &t) >= 0); \ + printf("result: %s\nexpect: %s\n", t, expected); \ if ((e = endswith(expected, "*"))) \ assert(strncmp(t, e, e-expected)); \ else \ @@ -138,6 +146,7 @@ static void test_unit_printf(void) { assert_se(setenv("USER", "root", 1) == 0); assert_se(setenv("HOME", "/root", 1) == 0); + assert_se(setenv("XDG_RUNTIME_DIR", "/run/user/1/", 1) == 0); assert_se(u = unit_new(m, sizeof(Service))); assert_se(unit_add_name(u, "blah.service") == 0); @@ -154,11 +163,9 @@ static void test_unit_printf(void) { expect(u, "%p", "blah"); expect(u, "%P", "blah"); expect(u, "%i", ""); - expect(u, "%I", ""); expect(u, "%u", root->pw_name); expect(u, "%U", root_uid); expect(u, "%h", root->pw_dir); - expect(u, "%s", root->pw_shell); expect(u, "%m", mid); expect(u, "%b", bid); expect(u, "%H", host); @@ -178,16 +185,145 @@ static void test_unit_printf(void) { expect(u2, "%u", root->pw_name); expect(u2, "%U", root_uid); expect(u2, "%h", root->pw_dir); - expect(u2, "%s", root->pw_shell); expect(u2, "%m", mid); expect(u2, "%b", bid); expect(u2, "%H", host); expect(u2, "%t", "/run/user/*"); + + manager_free(m); + + return 0; +} + +static void test_unit_instance_is_valid(void) { + assert_se(unit_instance_is_valid("fooBar")); + assert_se(unit_instance_is_valid("foo-bar")); + assert_se(unit_instance_is_valid("foo.stUff")); + assert_se(unit_instance_is_valid("fOo123.stuff")); + assert_se(unit_instance_is_valid("@f_oo123.Stuff")); + + assert_se(!unit_instance_is_valid("$¢£")); + assert_se(!unit_instance_is_valid("")); + assert_se(!unit_instance_is_valid("foo bar")); + assert_se(!unit_instance_is_valid("foo/bar")); +} + +static void test_unit_prefix_is_valid(void) { + assert_se(unit_prefix_is_valid("fooBar")); + assert_se(unit_prefix_is_valid("foo-bar")); + assert_se(unit_prefix_is_valid("foo.stUff")); + assert_se(unit_prefix_is_valid("fOo123.stuff")); + assert_se(unit_prefix_is_valid("foo123.Stuff")); + + assert_se(!unit_prefix_is_valid("$¢£")); + assert_se(!unit_prefix_is_valid("")); + assert_se(!unit_prefix_is_valid("foo bar")); + assert_se(!unit_prefix_is_valid("foo/bar")); + assert_se(!unit_prefix_is_valid("@foo-bar")); +} + +static void test_unit_name_change_suffix(void) { + char *r; + + r = unit_name_change_suffix("foo.bar", ".service"); + assert_se(r); + assert_se(streq(r, "foo.service")); + free(r); + + r = unit_name_change_suffix("foo@stuff.bar", ".boo"); + assert_se(r); + assert_se(streq(r, "foo@stuff.boo")); + free(r); +} + +static void test_unit_name_build(void) { + char *r; + + r = unit_name_build("foo", "bar", ".service"); + assert_se(r); + assert_se(streq(r, "foo@bar.service")); + free(r); + + r = unit_name_build("fo0-stUff_b", "bar", ".mount"); + assert_se(r); + assert_se(streq(r, "fo0-stUff_b@bar.mount")); + free(r); + + r = unit_name_build("foo", NULL, ".service"); + assert_se(r); + assert_se(streq(r, "foo.service")); + free(r); +} + +static void test_unit_name_is_instance(void) { + assert_se(unit_name_is_instance("a@b.service")); + assert_se(unit_name_is_instance("a-c_c01Aj@b05Dii_-oioi.service")); + + assert_se(!unit_name_is_instance("a.service")); + assert_se(!unit_name_is_instance("junk")); + assert_se(!unit_name_is_instance("")); +} + +static void test_build_subslice(void) { + char *a; + char *b; + + assert_se(build_subslice("-.slice", "foo", &a) >= 0); + assert_se(build_subslice(a, "bar", &b) >= 0); + free(a); + assert_se(build_subslice(b, "barfoo", &a) >= 0); + free(b); + assert_se(build_subslice(a, "foobar", &b) >= 0); + free(a); + assert_se(streq(b, "foo-bar-barfoo-foobar.slice")); + free(b); + + assert_se(build_subslice("foo.service", "bar", &a) < 0); + assert_se(build_subslice("foo", "bar", &a) < 0); +} + +static void test_unit_name_to_instance(void) { + char *instance; + int r; + + r = unit_name_to_instance("foo@bar.service", &instance); + assert_se(r >= 0); + assert_se(streq(instance, "bar")); + free(instance); + + r = unit_name_to_instance("fo0-stUff_b@b.e", &instance); + assert_se(r >= 0); + assert_se(streq(instance, "b")); + free(instance); + + r = unit_name_to_instance("foo.bar", &instance); + assert_se(r >= 0); + assert_se(!instance); + + r = unit_name_to_instance("fooj@unk", &instance); + assert_se(r < 0); +} + +static void test_unit_name_escape(void) { + _cleanup_free_ char *r; + + r = unit_name_escape("ab+-c.a/bc@foo.service"); + assert_se(r); + assert_se(streq(r, "ab\\x2b\\x2dc.a-bc\\x40foo.service")); } int main(int argc, char* argv[]) { + int rc = 0; test_replacements(); - test_unit_printf(); + TEST_REQ_RUNNING_SYSTEMD(rc = test_unit_printf()); + test_unit_instance_is_valid(); + test_unit_prefix_is_valid(); + test_unit_name_change_suffix(); + test_unit_name_build(); + test_unit_name_is_instance(); + test_build_subslice(); + test_unit_name_to_instance(); + test_unit_name_escape(); - return 0; + return rc; }