commit c4e3ba700e6b31c4eace1734315e84fc942e10a5
author Maciej Żenczykowski <maze@google.com> Fri Oct 28 00:53:21 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Oct 28 00:53:21 2022 +0000
tree ee63e02a1149991a980f7fc54317a73a96cd348a
parent 4a8b7fb767ad4e1dec7987511ac85dfeb6b83109
parent 23fc832f9cabae4932e9fca564e5b9dde0d9e735

Merge "Move ScopedUidChange to test_utils.h"

tests/binder_test.cpp

diff --git a/tests/binder_test.cpp b/tests/binder_test.cpp
index ba05813..2ca21ff 100644
--- a/tests/binder_test.cpp
+++ b/tests/binder_test.cpp
@@ -3516,23 +3516,6 @@
 
 namespace {
 
-class ScopedUidChange {
-  public:
-    explicit ScopedUidChange(uid_t uid) : mInputUid(uid) {
-        mStoredUid = geteuid();
-        if (mInputUid == mStoredUid) return;
-        EXPECT_TRUE(seteuid(uid) == 0);
-    }
-    ~ScopedUidChange() {
-        if (mInputUid == mStoredUid) return;
-        EXPECT_TRUE(seteuid(mStoredUid) == 0);
-    }
-
-  private:
-    uid_t mInputUid;
-    uid_t mStoredUid;
-};
-
 void clearQueue(int tunFd) {
     char buf[4096];
     int ret;

tests/test_utils.h

diff --git a/tests/test_utils.h b/tests/test_utils.h
index de6c221..2564255 100644
--- a/tests/test_utils.h
+++ b/tests/test_utils.h
@@ -21,6 +21,9 @@
 #include <string>
 #include <vector>
 
+#include <gtest/gtest.h>
+#include <unistd.h>
+
 int randomUid();
 
 std::vector<std::string> runCommand(const std::string& command);
@@ -37,3 +40,21 @@
 
 bool ipRouteExists(const char* ipVersion, const char* table,
                    const std::vector<std::string>& ipRouteSubstrings);
+
+// Require root (for seteuid).
+class ScopedUidChange {
+  public:
+    explicit ScopedUidChange(uid_t uid) : mInputUid(uid) {
+        mStoredUid = geteuid();
+        if (mInputUid == mStoredUid) return;
+        EXPECT_TRUE(seteuid(uid) == 0);
+    }
+    ~ScopedUidChange() {
+        if (mInputUid == mStoredUid) return;
+        EXPECT_TRUE(seteuid(mStoredUid) == 0);
+    }
+
+  private:
+    uid_t mInputUid;
+    uid_t mStoredUid;
+};