diff options
| author | Ken Chen <cken@google.com> | 2023-12-21 07:26:19 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-12-21 07:26:19 +0000 |
| commit | 6f108489ba7b2150dcb8bd9c7aece8166137f832 (patch) | |
| tree | 7bcc79c77fcff18a7c5ecf190123e97a4cdc831f | |
| parent | 9f4947504362dd251214e820f15761e426841bb9 (diff) | |
| parent | bf3066e1d43e3775ab1ed609780d3be30f2b6057 (diff) | |
| download | DnsResolver-6f108489ba7b2150dcb8bd9c7aece8166137f832.tar.gz | |
Merge "[Test] Add EXPECT_NO_FAILURE in BlockDnsQuery test" into main am: 0e8b220d5f am: bf3066e1d4
Original change: https://android-review.googlesource.com/c/platform/packages/modules/DnsResolver/+/2864725
Change-Id: Ib8b942ec09b6d47939c4ac32c5da81e44e020347
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | tests/resolv_private_dns_test.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/resolv_private_dns_test.cpp b/tests/resolv_private_dns_test.cpp index c9b8f46c..943a610f 100644 --- a/tests/resolv_private_dns_test.cpp +++ b/tests/resolv_private_dns_test.cpp @@ -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 */)); } } |