daandemeyer / rpms / systemd

Forked from rpms/systemd 2 years ago
Clone
36e8a3
From 1d43806017a0df257fef8ed6f79e12ee69c5bc20 Mon Sep 17 00:00:00 2001
36e8a3
From: Frantisek Sumsal <frantisek@sumsal.cz>
36e8a3
Date: Thu, 8 Nov 2018 09:40:13 +0100
36e8a3
Subject: [PATCH] tests: drop the precondition check for inherited flag
36e8a3
36e8a3
Docker's default capability set has the inherited flag already
36e8a3
set - that breaks tests which expect otherwise. Let's just
36e8a3
drop the check and run the test anyway.
36e8a3
36e8a3
Fixes #10663
36e8a3
36e8a3
Cherry-picked from: c446b8486d9ed18d1bc780948ae9ee8a53fa4c3f
36e8a3
---
36e8a3
 src/test/test-capability.c | 8 --------
36e8a3
 1 file changed, 8 deletions(-)
36e8a3
36e8a3
diff --git a/src/test/test-capability.c b/src/test/test-capability.c
4bff0a
index af6d808b6d..72975cef94 100644
36e8a3
--- a/src/test/test-capability.c
36e8a3
+++ b/src/test/test-capability.c
36e8a3
@@ -180,8 +180,6 @@ static void test_update_inherited_set(void) {
36e8a3
 
36e8a3
         caps = cap_get_proc();
36e8a3
         assert_se(caps);
36e8a3
-        assert_se(!cap_get_flag(caps, CAP_CHOWN, CAP_INHERITABLE, &fv));
36e8a3
-        assert(fv == CAP_CLEAR);
36e8a3
 
36e8a3
         set = (UINT64_C(1) << CAP_CHOWN);
36e8a3
 
36e8a3
@@ -197,12 +195,6 @@ static void test_set_ambient_caps(void) {
36e8a3
         uint64_t set = 0;
36e8a3
         cap_flag_value_t fv;
36e8a3
 
36e8a3
-        caps = cap_get_proc();
36e8a3
-        assert_se(caps);
36e8a3
-        assert_se(!cap_get_flag(caps, CAP_CHOWN, CAP_INHERITABLE, &fv));
36e8a3
-        assert(fv == CAP_CLEAR);
36e8a3
-        cap_free(caps);
36e8a3
-
36e8a3
         assert_se(prctl(PR_CAP_AMBIENT, PR_CAP_AMBIENT_IS_SET, CAP_CHOWN, 0, 0) == 0);
36e8a3
 
36e8a3
         set = (UINT64_C(1) << CAP_CHOWN);