picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #8378 from evverx/get-around-freopen

Browse source 
tests: stop using `freopen` in `test-fileio`
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2018-03-07 11:35:35 +01:00 committed by GitHub
parent 48af1eb6ee 9a92e25545
commit 6f10433df7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/test/test-fileio.c
View file

@ -406,7 +406,7 @@ static void test_capeff(void) {
static void test_write_string_stream(void) {
char fn[] = "/tmp/test-write_string_stream-XXXXXX";
_cleanup_fclose_ FILE *f = NULL;
FILE *f = NULL;
int fd;
char buf[64];
@ -416,8 +416,9 @@ static void test_write_string_stream(void) {
f = fdopen(fd, "r");
assert_se(f);
assert_se(write_string_stream(f, "boohoo", 0) < 0);
f = safe_fclose(f);
f = freopen(fn, "r+", f);
f = fopen(fn, "r+");
assert_se(f);
assert_se(write_string_stream(f, "boohoo", 0) == 0);
@ -425,8 +426,9 @@ static void test_write_string_stream(void) {
assert_se(fgets(buf, sizeof(buf), f));
assert_se(streq(buf, "boohoo\n"));
f = safe_fclose(f);
f = freopen(fn, "w+", f);
f = fopen(fn, "w+");
assert_se(f);
assert_se(write_string_stream(f, "boohoo", WRITE_STRING_FILE_AVOID_NEWLINE) == 0);
@ -435,6 +437,7 @@ static void test_write_string_stream(void) {
assert_se(fgets(buf, sizeof(buf), f));
printf(">%s<", buf);
assert_se(streq(buf, "boohoo"));
f = safe_fclose(f);
unlink(fn);
}
@ -607,7 +610,8 @@ static void test_writing_tmpfile(void) {
char name[] = "/tmp/test-systemd_writing_tmpfile.XXXXXX";
_cleanup_free_ char *contents = NULL;
size_t size;
int fd, r;
int r;
_cleanup_close_ int fd = -1;
struct iovec iov[3];
iov[0] = IOVEC_MAKE_STRING("abc\n");