X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Ftest%2Ftest-unit-file.c;h=03b3e259399c019c75c7fb3e8ffa08e48fb12c46;hb=9f03ee51a2207954ef18be79ca3e11cd14ca56fd;hp=1b4133b5d34004ba999d02b6cffc027541f52bd2;hpb=71a6151083d842b2f5bf04e50239f0bf85d34d2e;p=elogind.git diff --git a/src/test/test-unit-file.c b/src/test/test-unit-file.c index 1b4133b5d..03b3e2593 100644 --- a/src/test/test-unit-file.c +++ b/src/test/test-unit-file.c @@ -25,6 +25,7 @@ #include #include #include +#include #include "install.h" #include "install-printf.h" @@ -43,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) @@ -221,19 +228,21 @@ static void test_load_env_file_1(void) { int r; char name[] = "/tmp/test-load-env-file.XXXXXX"; - _cleanup_close_ int fd = mkstemp(name); - assert(fd >= 0); + _cleanup_close_ int fd; + + fd = mkostemp_safe(name, O_RDWR|O_CLOEXEC); + 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); } @@ -242,14 +251,16 @@ static void test_load_env_file_2(void) { int r; char name[] = "/tmp/test-load-env-file.XXXXXX"; - _cleanup_close_ int fd = mkstemp(name); - assert(fd >= 0); + _cleanup_close_ int fd; + + fd = mkostemp_safe(name, O_RDWR|O_CLOEXEC); + 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); } @@ -258,38 +269,38 @@ static void test_load_env_file_3(void) { int r; char name[] = "/tmp/test-load-env-file.XXXXXX"; - _cleanup_close_ int fd = mkstemp(name); - assert(fd >= 0); + _cleanup_close_ int fd; + + fd = mkostemp_safe(name, O_RDWR|O_CLOEXEC); + 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); } static void test_load_env_file_4(void) { _cleanup_strv_free_ char **data = NULL; + char name[] = "/tmp/test-load-env-file.XXXXXX"; + _cleanup_close_ int fd; int r; - char name[] = "/tmp/test-load-env-file.XXXXXX"; - _cleanup_close_ int fd = mkstemp(name); - assert(fd >= 0); + fd = mkostemp_safe(name, O_RDWR|O_CLOEXEC); + 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); } -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wnonnull" - static void test_install_printf(void) { char name[] = "name.service", path[] = "/run/systemd/system/name.service", @@ -318,11 +329,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); \ @@ -335,7 +346,11 @@ static void test_install_printf(void) { expect(i, "%p", "name"); expect(i, "%i", ""); expect(i, "%u", "xxxx-no-such-user"); + + DISABLE_WARNING_NONNULL; expect(i, "%U", NULL); + REENABLE_WARNING; + expect(i, "%m", mid); expect(i, "%b", bid); expect(i, "%H", host); @@ -347,7 +362,11 @@ static void test_install_printf(void) { expect(i3, "%N", "name@inst"); expect(i3, "%p", "name"); expect(i3, "%u", "xxxx-no-such-user"); + + DISABLE_WARNING_NONNULL; expect(i3, "%U", NULL); + REENABLE_WARNING; + expect(i3, "%m", mid); expect(i3, "%b", bid); expect(i3, "%H", host); @@ -355,7 +374,6 @@ static void test_install_printf(void) { expect(i4, "%u", "root"); expect(i4, "%U", "0"); } -#pragma GCC diagnostic pop int main(int argc, char *argv[]) { int r;