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

Commit a3651064 authored by Mike Yu's avatar Mike Yu Committed by Automerger Merge Worker
Browse files

Test: Catch all Nat64PrefixUpdates in PrefixDiscoveryBypassTls am: 3d955a93 

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



Change-Id: Ib7de6baa6082170ace584215e241250e28a9a36c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e6344c1d 3d955a93

tests/resolv_integration_test.cpp

+13 −0
Original line number Original line Diff line number Diff line
@@ -4124,6 +4124,9 @@ TEST_F(ResolverTest, PrefixDiscoveryBypassTls) { 
    EXPECT_EQ(0, tls.queries()) << dns.dumpQueries();

    EXPECT_EQ(0, tls.queries()) << dns.dumpQueries();

    EXPECT_EQ(1U, GetNumQueries(dns, dns64_name)) << dns.dumpQueries();

    EXPECT_EQ(1U, GetNumQueries(dns, dns64_name)) << dns.dumpQueries();





    EXPECT_TRUE(mDnsClient.resolvService()->stopPrefix64Discovery(TEST_NETID).isOk());

    EXPECT_TRUE(WaitForNat64Prefix(EXPECT_NOT_FOUND));



    // Restart the testing network to reset the cache.

    // Restart the testing network to reset the cache.

    mDnsClient.TearDown();

    mDnsClient.TearDown();

    mDnsClient.SetUp();

    mDnsClient.SetUp();
@@ -4147,6 +4150,16 @@ TEST_F(ResolverTest, PrefixDiscoveryBypassTls) { 
    // Verify it bypassed TLS despite STRICT mode.

    // Verify it bypassed TLS despite STRICT mode.

    EXPECT_EQ(0, tls.queries()) << dns.dumpQueries();

    EXPECT_EQ(0, tls.queries()) << dns.dumpQueries();

    EXPECT_EQ(1U, GetNumQueries(dns, dns64_name)) << dns.dumpQueries();

    EXPECT_EQ(1U, GetNumQueries(dns, dns64_name)) << dns.dumpQueries();



    // Stop the prefix discovery to make DnsResolver send the prefix-removed event

    // earlier. Without this, DnsResolver still sends the event once the network

    // is destroyed; however, it will fail the next test if the test unexpectedly

    // receives the event that it doesn't want.

    EXPECT_TRUE(mDnsClient.resolvService()->stopPrefix64Discovery(TEST_NETID).isOk());

    EXPECT_TRUE(WaitForNat64Prefix(EXPECT_NOT_FOUND));



    EXPECT_EQ(0, sDnsMetricsListener->getUnexpectedNat64PrefixUpdates());

    EXPECT_EQ(0, sUnsolicitedEventListener->getUnexpectedNat64PrefixUpdates());

}

}





TEST_F(ResolverTest, SetAndClearNat64Prefix) {

TEST_F(ResolverTest, SetAndClearNat64Prefix) {