From: Balint Reczey <balint.reczey@canonical.com>
Date: Tue, 5 May 2020 19:24:53 +0000 (+0200)
Subject: test: Skip test-boot-timestamps on permission denied
X-Git-Tag: v246-rc1~430
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e48471b94885b7e9861d468974cfc00e1455a7fd;p=thirdparty%2Fsystemd.git

test: Skip test-boot-timestamps on permission denied

In containers even root can be denied to access the needed files.
---

diff --git a/src/test/test-boot-timestamps.c b/src/test/test-boot-timestamps.c
index 3c7f7a98cf8..29074ecccd3 100644
--- a/src/test/test-boot-timestamps.c
+++ b/src/test/test-boot-timestamps.c
@@ -17,7 +17,7 @@ static int test_acpi_fpdt(void) {
 
         r = acpi_get_boot_usec(&loader_start, &loader_exit);
         if (r < 0) {
-                bool ok = r == -ENOENT || (getuid() != 0 && r == -EACCES) || r == -ENODATA;
+                bool ok = r == -ENOENT || r == -EACCES || r == -ENODATA;
 
                 log_full_errno(ok ? LOG_DEBUG : LOG_ERR, r, "Failed to read ACPI FPDT: %m");
                 return ok ? 0 : r;
@@ -37,7 +37,7 @@ static int test_efi_loader(void) {
 
         r = efi_loader_get_boot_usec(&loader_start, &loader_exit);
         if (r < 0) {
-                bool ok = r == -ENOENT || (getuid() != 0 && r == -EACCES) || r == -EOPNOTSUPP;
+                bool ok = r == -ENOENT || r == -EACCES || r == -EOPNOTSUPP;
 
                 log_full_errno(ok ? LOG_DEBUG : LOG_ERR, r, "Failed to read EFI loader data: %m");
                 return ok ? 0 : r;
@@ -59,7 +59,7 @@ static int test_boot_timestamps(void) {
 
         r = boot_timestamps(NULL, &fw, &l);
         if (r < 0) {
-                bool ok = r == -ENOENT || (getuid() != 0 && r == -EACCES) || r == -EOPNOTSUPP;
+                bool ok = r == -ENOENT || r == -EACCES || r == -EOPNOTSUPP;
 
                 log_full_errno(ok ? LOG_DEBUG : LOG_ERR, r, "Failed to read variables: %m");
                 return ok ? 0 : r;