summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaciej Żenczykowski <maze@google.com>2022-10-20 22:18:29 +0000
committerCherrypicker Worker <android-build-cherrypicker-worker@google.com>2022-10-26 00:08:15 +0000
commit74a58ecfbb39d8ac9418072300e1b4e8c84f344b (patch)
treedbbf0137323b9fda725dd123c37f309f9839c872
parente4bff459efa16b95eb00c9114f36f3243756712f (diff)
downloadnetd-74a58ecfbb39d8ac9418072300e1b4e8c84f344b.tar.gz
bpf_base_test - unconditionally run TestSocketFilterSetUp
We require 4.14 kernel so the condition is always true, and thus this test is never actually skipped. Additionally this test is outright incorrect, because BpfHandler::initMaps() requires the uid permission map open to succeed, and furthermore BpfHandler::hasUpdateDeviceStatsPermission requires it for things to even work, as this is used as part of tagSocket() permission checks. (side note: it's ugly that this netd test is reaching into mainline stuff... but fixing that is a different TODO) Test: TreeHugger Signed-off-by: Maciej Żenczykowski <maze@google.com> Change-Id: I4ea401e8bd73f9c3fce4498582dbcdf247a9453b (cherry picked from commit 92ac128dc27a91b6a3ae90918edefe61eecda5f4) Merged-In: I4ea401e8bd73f9c3fce4498582dbcdf247a9453b
-rw-r--r--tests/bpf_base_test.cpp2
1 files changed, 0 insertions, 2 deletions
diff --git a/tests/bpf_base_test.cpp b/tests/bpf_base_test.cpp
index e402e08e..60741b71 100644
--- a/tests/bpf_base_test.cpp
+++ b/tests/bpf_base_test.cpp
@@ -76,8 +76,6 @@ TEST_F(BpfBasicTest, TestTrafficControllerSetUp) {
}
TEST_F(BpfBasicTest, TestSocketFilterSetUp) {
- SKIP_IF_EXTENDED_BPF_NOT_SUPPORTED;
-
ASSERT_EQ(0, access(CGROUP_SOCKET_PROG_PATH, R_OK));
ASSERT_EQ(0, access(UID_PERMISSION_MAP_PATH, R_OK));
}