summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2013-07-29 19:49:55 -0400
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2013-07-30 09:29:21 -0400
commit095b30cbf976b6c82a10c16bef76fa5b4c03f658 (patch)
treedb619c22de158356b654092620ad4c63c258a16e
parente861b62154173b730c3fd8ca040641fba8870bb6 (diff)
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.
-rw-r--r--src/test/test-fileio.c13
1 files changed, 8 insertions, 5 deletions
diff --git a/src/test/test-fileio.c b/src/test/test-fileio.c
index b08e796b7d..76a43d9b69 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) {