[systemd-commits] 2 commits - src/test

[Zbigniew Jędrzejewski-Szmek]

 src/test/test-fileio.c    |   13 ++++++++-----
 src/test/test-unit-file.c |   15 ++++++++++-----
 2 files changed, 18 insertions(+), 10 deletions(-)

New commits:
commit 751e75769a0a8a255e1a47656f639768879e9518
Author: Christian Hesse <list at eworm.de>
Date:   Tue Jul 30 09:07:20 2013 -0400

    test-unit-file: return error without dumping core on permission error

diff --git a/src/test/test-unit-file.c b/src/test/test-unit-file.c
index a7fe77a..2075e86 100644
--- a/src/test/test-unit-file.c
+++ b/src/test/test-unit-file.c
@@ -36,7 +36,7 @@
 #include "strv.h"
 #include "fileio.h"
 
-static void test_unit_file_get_set(void) {
+static int test_unit_file_get_set(void) {
         int r;
         Hashmap *h;
         Iterator i;
@@ -46,13 +46,17 @@ static void test_unit_file_get_set(void) {
         assert(h);
 
         r = unit_file_get_list(UNIT_FILE_SYSTEM, NULL, h);
-        log_info("unit_file_get_list: %s", strerror(-r));
-        assert(r >= 0);
+        log_full(r == 0 ? LOG_INFO : LOG_ERR,
+                 "unit_file_get_list: %s", strerror(-r));
+        if (r < 0)
+                return EXIT_FAILURE;
 
         HASHMAP_FOREACH(p, h, i)
                 printf("%s = %s\n", p->path, unit_file_state_to_string(p->state));
 
         unit_file_list_free(h);
+
+        return 0;
 }
 
 static void check_execcommand(ExecCommand *c,
@@ -351,11 +355,12 @@ static void test_install_printf(void) {
 #pragma GCC diagnostic pop
 
 int main(int argc, char *argv[]) {
+        int r;
 
         log_parse_environment();
         log_open();
 
-        test_unit_file_get_set();
+        r = test_unit_file_get_set();
         test_config_parse_exec();
         test_load_env_file_1();
         test_load_env_file_2();
@@ -363,5 +368,5 @@ int main(int argc, char *argv[]) {
         test_load_env_file_4();
         test_install_printf();
 
-        return 0;
+        return r;
 }

commit 095b30cbf976b6c82a10c16bef76fa5b4c03f658
Author: Zbigniew Jędrzejewski-Szmek <zbyszek at in.waw.pl>
Date:   Mon Jul 29 19:49:55 2013 -0400

    test-fileio: use random name for written file
    
    If two instances of test-fileio were run in parallel,
    they could fail when trying to write the same file.
    This predictable name in /tmp/ wasn't actually a security
    issue, because write_env_file would not follow symlinks,
    so this could be an issue only when running tests in
    parallel.

diff --git a/src/test/test-fileio.c b/src/test/test-fileio.c
index b08e796..76a43d9 100644
--- a/src/test/test-fileio.c
+++ b/src/test/test-fileio.c
@@ -29,7 +29,8 @@
 #include "env-util.h"
 
 static void test_parse_env_file(void) {
-        char t[] = "/tmp/test-parse-env-file-XXXXXX";
+        char    t[] = "/tmp/test-fileio-in-XXXXXX",
+                p[] = "/tmp/test-fileio-out-XXXXXX";
         int fd, r;
         FILE *f;
         _cleanup_free_ char *one = NULL, *two = NULL, *three = NULL, *four = NULL, *five = NULL,
@@ -38,6 +39,8 @@ static void test_parse_env_file(void) {
         char **i;
         unsigned k;
 
+        assert_se(mktemp(p));
+
         fd = mkostemp(t, O_CLOEXEC);
         assert_se(fd >= 0);
 
@@ -83,7 +86,7 @@ static void test_parse_env_file(void) {
         assert_se(streq(a[9], "ten="));
         assert_se(a[10] == NULL);
 
-        strv_env_clean_log(a, "/tmp/test-fileio");
+        strv_env_clean_log(a, "test");
 
         k = 0;
         STRV_FOREACH(i, b) {
@@ -129,14 +132,14 @@ static void test_parse_env_file(void) {
         assert_se(streq(nine, "nineval"));
         assert_se(ten == NULL);
 
-        r = write_env_file("/tmp/test-fileio", a);
+        r = write_env_file(p, a);
         assert_se(r >= 0);
 
-        r = load_env_file("/tmp/test-fileio", NULL, &b);
+        r = load_env_file(p, NULL, &b);
         assert_se(r >= 0);
 
         unlink(t);
-        unlink("/tmp/test-fileio");
+        unlink(p);
 }
 
 static void test_executable_is_script(void) {