From: Tobias Brunner <tobias@strongswan.org>
Date: Fri, 16 May 2014 15:43:42 +0000 (+0200)
Subject: unit-tests: Don't assert failures for unreadable settings files as root
X-Git-Tag: 5.2.0dr5~37
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7c888e0d23b98b00a11616364499f0f651f9c481;p=thirdparty%2Fstrongswan.git

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.
---

diff --git a/src/libstrongswan/tests/suites/test_settings.c b/src/libstrongswan/tests/suites/test_settings.c
index e504b95a1b..97e45fc04e 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");