From 9e4aa04ad1f6e63f4aa99f516b19e4ff2592918b Mon Sep 17 00:00:00 2001
From: Fabricio Voznika <fvoznika@google.com>
Date: Thu, 22 Apr 2021 20:04:17 -0700
Subject: Remove side effect from mount tests

Dropping CAP_SYS_ADMIN and not restoring it causes
other tests to be skipped.

PiperOrigin-RevId: 370002644
---
 test/util/capability_util.h | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

(limited to 'test/util/capability_util.h')

diff --git a/test/util/capability_util.h b/test/util/capability_util.h
index a03bc7e05..f2c370125 100644
--- a/test/util/capability_util.h
+++ b/test/util/capability_util.h
@@ -99,14 +99,23 @@ PosixErrorOr<bool> CanCreateUserNamespace();
 class AutoCapability {
  public:
   AutoCapability(int cap, bool set) : cap_(cap), set_(set) {
-    EXPECT_NO_ERRNO(SetCapability(cap_, set_));
+    const bool has = EXPECT_NO_ERRNO_AND_VALUE(HaveCapability(cap));
+    if (set != has) {
+      EXPECT_NO_ERRNO(SetCapability(cap_, set_));
+      applied_ = true;
+    }
   }
 
-  ~AutoCapability() { EXPECT_NO_ERRNO(SetCapability(cap_, !set_)); }
+  ~AutoCapability() {
+    if (applied_) {
+      EXPECT_NO_ERRNO(SetCapability(cap_, !set_));
+    }
+  }
 
  private:
   int cap_;
   bool set_;
+  bool applied_ = false;
 };
 
 }  // namespace testing
-- 
cgit v1.2.3