X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Ftest%2Ftest-unit-name.c;h=ab6c488cffb7627901892435b92ea471470ddcf0;hp=3041ae3d598dae3000b508943458c5b752262a0b;hb=0e707326fcecd3968efa7dc827123032f1b2cb61;hpb=23c3a89b897b6bc410d1f321355f9c41fa74fea4 diff --git a/src/test/test-unit-name.c b/src/test/test-unit-name.c index 3041ae3d5..ab6c488cf 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 @@ -42,7 +43,7 @@ static void test_replacements(void) { _cleanup_free_ char *t = \ unit_name_replace_instance(pattern, repl); \ puts(t); \ - assert(streq(t, expected)); \ + assert_se(streq(t, expected)); \ } expect("foo@.service", "waldo", "foo@waldo.service"); @@ -63,7 +64,7 @@ static void test_replacements(void) { puts(t); \ k = unit_name_to_path(t); \ puts(k); \ - assert(streq(k, expected ? expected : path)); \ + assert_se(streq(k, expected ? expected : path)); \ } expect("/waldo", ".mount", NULL); @@ -74,12 +75,12 @@ static void test_replacements(void) { puts("-------------------------------------------------"); #undef expect -#define expect(pattern, path, suffix, expected) \ - { \ - _cleanup_free_ char *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_se(streq(t, expected)); \ } expect("waldo", "/waldo", ".mount", "waldo@waldo.mount"); @@ -89,13 +90,13 @@ static void test_replacements(void) { puts("-------------------------------------------------"); #undef expect -#define expect(pattern) \ - { \ - _cleanup_free_ char *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"); @@ -110,7 +111,7 @@ static void test_replacements(void) { } static int test_unit_printf(void) { - Manager *m; + Manager *m = NULL; Unit *u, *u2; int r; @@ -124,27 +125,28 @@ static int test_unit_printf(void) { assert_se((root = getpwnam("root"))); assert_se(asprintf(&root_uid, "%d", (int) root->pw_uid) > 0); - r = manager_new(SYSTEMD_USER, &m); + r = manager_new(SYSTEMD_USER, true, &m); if (r == -EPERM || r == -EACCES || r == -EADDRINUSE) { puts("manager_new: Permission denied. Skipping test."); return EXIT_TEST_SKIP; } - assert(r == 0); + assert_se(r == 0); #define expect(unit, pattern, expected) \ { \ char *e; \ - _cleanup_free_ char *t; \ + _cleanup_free_ char *t = NULL; \ 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)); \ + assert_se(strncmp(t, e, e-expected)); \ else \ - assert(streq(t, expected)); \ + assert_se(streq(t, expected)); \ } 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); @@ -193,9 +195,135 @@ static int test_unit_printf(void) { 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_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 rc; }