Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6f108489 authored by Ken Chen's avatar Ken Chen Committed by Automerger Merge Worker
Browse files

Merge "[Test] Add EXPECT_NO_FAILURE in BlockDnsQuery test" into main am: 0e8b220d am: bf3066e1 

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



Change-Id: Ib8b942ec09b6d47939c4ac32c5da81e44e020347
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9f494750 bf3066e1

tests/resolv_private_dns_test.cpp

+3 −3
Original line number Diff line number Diff line
@@ -575,14 +575,14 @@ TEST_P(TransportParameterizedTest, BlockDnsQuery) { 
            // DataSaver information is only meaningful after V.

            // TODO: Add 'else' to check that DNS queries are not blocked before V.

            if (android::modules::sdklevel::IsAtLeastV()) {

                expectQueriesAreBlocked();

                EXPECT_NO_FAILURE(expectQueriesAreBlocked());

            }

        } else {

            // Block network access by setting UID firewall rules.

            ScopeBlockedUIDRule scopeBlockUidRule(mDnsClient.netdService(), TEST_UID);

            expectQueriesAreBlocked();

            EXPECT_NO_FAILURE(expectQueriesAreBlocked());

        }

        expectQueries(0 /* dns */, 0 /* dot */, 0 /* doh */);

        EXPECT_NO_FAILURE(expectQueries(0 /* dns */, 0 /* dot */, 0 /* doh */));

    }

}