From 7c888e0d23b98b00a11616364499f0f651f9c481 Mon Sep 17 00:00:00 2001 From: Tobias Brunner Date: Fri, 16 May 2014 17:43:42 +0200 Subject: [PATCH] unit-tests: Don't assert failures for unreadable settings files as root The file can still be read by root even if nobody has read privileges. --- src/libstrongswan/tests/suites/test_settings.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/libstrongswan/tests/suites/test_settings.c b/src/libstrongswan/tests/suites/test_settings.c index e504b95a1..97e45fc04 100644 --- a/src/libstrongswan/tests/suites/test_settings.c +++ b/src/libstrongswan/tests/suites/test_settings.c @@ -675,11 +675,14 @@ START_TEST(test_load_files_section) ck_assert(!settings->load_files_section(settings, include1".conf", TRUE, "")); verify_include(); - /* unreadable files are too */ - ck_assert(chunk_write(contents, include1".no", 0444, TRUE)); - ck_assert(!settings->load_files_section(settings, include1".no", TRUE, "")); - unlink(include1".no"); - verify_include(); + /* unreadable files are too (only fails when not running as root) */ + if (getuid() != 0) + { + ck_assert(chunk_write(contents, include1".no", 0444, TRUE)); + ck_assert(!settings->load_files_section(settings, include1".no", TRUE, "")); + unlink(include1".no"); + verify_include(); + } ck_assert(settings->load_files_section(settings, include2, FALSE, "main")); verify_null("main.key1");