From 8461d6da35d290de0a2f7b8046bdc5d45ebc37f6 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Fri, 21 May 2021 17:35:12 +0200 Subject: [PATCH] test-fileio: fix confusing log output Previously we'd pass all return values of read_virtual_file() to log_info_errno() as error, but that makes no sense, given that we sometimes return positive one with means "not truncated" but we'd show as "Permission denied. Let's fix this, and log differently for sucess and error. --- src/test/test-fileio.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/test/test-fileio.c b/src/test/test-fileio.c index 51ae6652797..9c5c7bf7379 100644 --- a/src/test/test-fileio.c +++ b/src/test/test-fileio.c @@ -1034,8 +1034,11 @@ static void test_read_virtual_file(size_t max_size) { size_t size = 0; r = read_virtual_file(filename, max_size, &buf, &size); - log_info_errno(r, "read_virtual_file(\"%s\", %zu): %m (%zu bytes)", filename, max_size, size); - assert_se(r == 0 || ERRNO_IS_PRIVILEGE(r) || r == -ENOENT); + if (r < 0) { + log_info_errno(r, "read_virtual_file(\"%s\", %zu): %m", filename, max_size); + assert_se(ERRNO_IS_PRIVILEGE(r) || r == -ENOENT); + } else + log_info("read_virtual_file(\"%s\", %zu): %s (%zu bytes)", filename, max_size, r ? "non-truncated" : "truncated", size); } } -- 2.47.3