diff options
| author | Maciej Żenczykowski <maze@google.com> | 2022-05-31 03:15:12 -0700 |
|---|---|---|
| committer | Maciej Żenczykowski <maze@google.com> | 2022-06-08 01:25:27 +0000 |
| commit | 787de0100e6a19ca60b6421311cb77a6192a1a5f (patch) | |
| tree | bad23c11bb8c8aa900046bfa318524d31f399129 /service/native/TrafficControllerTest.cpp | |
| parent | 8468153edb6658a0855d3973b5b0b2dc3e5dab18 (diff) | |
simplify bpf tests and check type correctness
We notice that:
BpfMap.reset(dupFd_with_cloexec(BpfMap.getMap())
is equivalent to
BpfMap = BpfMap
due to the current implementation of the BpfMap assignment operator.
Except the latter also verifies BpfMap<K,V> template types match.
Bug: 235286176
Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I99fcf77bc6aa360b6a19e22c2cd58d67a1e62976
(cherry picked from commit 55ab87aa4937f562e6952c5b88e90eae6eca41c4)
Merged-In: I99fcf77bc6aa360b6a19e22c2cd58d67a1e62976
Diffstat (limited to 'service/native/TrafficControllerTest.cpp')
| -rw-r--r-- | service/native/TrafficControllerTest.cpp | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/service/native/TrafficControllerTest.cpp b/service/native/TrafficControllerTest.cpp index 9ec50af6ef..6c2cd9f91e 100644 --- a/service/native/TrafficControllerTest.cpp +++ b/service/native/TrafficControllerTest.cpp @@ -96,29 +96,25 @@ class TrafficControllerTest : public ::testing::Test { createMap(BPF_MAP_TYPE_HASH, sizeof(uint32_t), sizeof(uint8_t), TEST_MAP_SIZE, 0)); ASSERT_VALID(mFakeUidPermissionMap); - mTc.mCookieTagMap.reset(dupFd(mFakeCookieTagMap.getMap())); + mTc.mCookieTagMap = mFakeCookieTagMap; ASSERT_VALID(mTc.mCookieTagMap); - mTc.mAppUidStatsMap.reset(dupFd(mFakeAppUidStatsMap.getMap())); + mTc.mAppUidStatsMap = mFakeAppUidStatsMap; ASSERT_VALID(mTc.mAppUidStatsMap); - mTc.mStatsMapA.reset(dupFd(mFakeStatsMapA.getMap())); + mTc.mStatsMapA = mFakeStatsMapA; ASSERT_VALID(mTc.mStatsMapA); - mTc.mConfigurationMap.reset(dupFd(mFakeConfigurationMap.getMap())); + mTc.mConfigurationMap = mFakeConfigurationMap; ASSERT_VALID(mTc.mConfigurationMap); // Always write to stats map A by default. ASSERT_RESULT_OK(mTc.mConfigurationMap.writeValue(CURRENT_STATS_MAP_CONFIGURATION_KEY, SELECT_MAP_A, BPF_ANY)); - mTc.mUidOwnerMap.reset(dupFd(mFakeUidOwnerMap.getMap())); + mTc.mUidOwnerMap = mFakeUidOwnerMap; ASSERT_VALID(mTc.mUidOwnerMap); - mTc.mUidPermissionMap.reset(dupFd(mFakeUidPermissionMap.getMap())); + mTc.mUidPermissionMap = mFakeUidPermissionMap; ASSERT_VALID(mTc.mUidPermissionMap); mTc.mPrivilegedUser.clear(); } - int dupFd(const android::base::unique_fd& mapFd) { - return fcntl(mapFd.get(), F_DUPFD_CLOEXEC, 0); - } - void populateFakeStats(uint64_t cookie, uint32_t uid, uint32_t tag, StatsKey* key) { UidTagValue cookieMapkey = {.uid = (uint32_t)uid, .tag = tag}; EXPECT_RESULT_OK(mFakeCookieTagMap.writeValue(cookie, cookieMapkey, BPF_ANY)); |