commit 125c83abaf100fedfdd6a79ba1014272bc26208a
author Ken Chen <cken@google.com> Tue Apr 12 01:28:50 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Apr 12 01:28:50 2022 +0000
tree 69b3690a4c005ffacd5c88e570e6406840cf8975
parent a9473be354c6eb6722702940f2758caebac04b6c
parent 637b7b79877295335f79c3311d963bf1070a1fd1

Merge "Enable temporarily disabled resolver tests on Q/R/S" am: d5d3eb6131 am: 637b7b7987

Original change: https://android-review.googlesource.com/c/platform/packages/modules/DnsResolver/+/2058287

Change-Id: Ieda5564132cec1cb49af748213275324a6953f33
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

tests/resolv_integration_test.cpp

diff --git a/tests/resolv_integration_test.cpp b/tests/resolv_integration_test.cpp
index c98cc7b..b7a9f97 100644
--- a/tests/resolv_integration_test.cpp
+++ b/tests/resolv_integration_test.cpp
@@ -4241,8 +4241,9 @@
     EXPECT_EQ(500, readResponseCode(fd));
 }
 
-// TODO(b/219434602): find an alternative way to block DNS packets or delete the test.
-TEST_F(ResolverTest, DISABLED_BlockDnsQueryWithUidRule) {
+// TODO(b/219434602): find an alternative way to block DNS packets on T+.
+TEST_F(ResolverTest, BlockDnsQueryWithUidRule) {
+    if (android::modules::sdklevel::IsAtLeastT()) GTEST_SKIP() << "T+ device.";
     SKIP_IF_BPF_NOT_SUPPORTED;
     constexpr char listen_addr1[] = "127.0.0.4";
     constexpr char listen_addr2[] = "::1";
@@ -4290,8 +4291,9 @@
     }
 }
 
-// TODO(b/219434602): find an alternative way to block DNS packets or delete the test.
-TEST_F(ResolverTest, DISABLED_GetAddrinfo_BlockDnsQueryWithUidRule) {
+// TODO(b/219434602): find an alternative way to block DNS packets on T+.
+TEST_F(ResolverTest, GetAddrinfo_BlockDnsQueryWithUidRule) {
+    if (android::modules::sdklevel::IsAtLeastT()) GTEST_SKIP() << "T+ device.";
     SKIP_IF_BPF_NOT_SUPPORTED;
     constexpr char listen_addr1[] = "127.0.0.4";
     constexpr char listen_addr2[] = "::1";
@@ -4341,8 +4343,9 @@
     }
 }
 
-// TODO(b/219434602): find an alternative way to block DNS packets or delete the test.
-TEST_F(ResolverTest, DISABLED_EnforceDnsUid) {
+// TODO(b/219434602): find an alternative way to block DNS packets on T+.
+TEST_F(ResolverTest, EnforceDnsUid) {
+    if (android::modules::sdklevel::IsAtLeastT()) GTEST_SKIP() << "T+ device.";
     SKIP_IF_BPF_NOT_SUPPORTED;
     constexpr char listen_addr1[] = "127.0.0.4";
     constexpr char listen_addr2[] = "::1";
@@ -5908,8 +5911,9 @@
     EXPECT_EQ(0U, GetNumQueries(dns, kHelloExampleCom));
 }
 
-// TODO(b/219434602): find an alternative way to block DNS packets or delete the test.
-TEST_F(ResolverTest, DISABLED_BlockDnsQueryUidDoesNotLeadToBadServer) {
+// TODO(b/219434602): find an alternative way to block DNS packets on T+.
+TEST_F(ResolverTest, BlockDnsQueryUidDoesNotLeadToBadServer) {
+    if (android::modules::sdklevel::IsAtLeastT()) GTEST_SKIP() << "T+ device.";
     SKIP_IF_BPF_NOT_SUPPORTED;
     constexpr char listen_addr1[] = "127.0.0.4";
     constexpr char listen_addr2[] = "::1";
@@ -7159,8 +7163,9 @@
     EXPECT_EQ(GetNumQueries(*dnsPair2->dnsServer, host_name), 1U);
 }
 
-// TODO(b/219434602): find an alternative way to block DNS packets or delete the test.
-TEST_F(ResolverMultinetworkTest, DISABLED_DnsWithVpn) {
+// TODO(b/219434602): find an alternative way to block DNS packets on T+.
+TEST_F(ResolverMultinetworkTest, DnsWithVpn) {
+    if (android::modules::sdklevel::IsAtLeastT()) GTEST_SKIP() << "T+ device.";
     SKIP_IF_BPF_NOT_SUPPORTED;
     SKIP_IF_REMOTE_VERSION_LESS_THAN(mDnsClient.resolvService(), 4);
     constexpr char host_name[] = "ohayou.example.com.";