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

Commit b0dd46c4 authored by Remi NGUYEN VAN's avatar Remi NGUYEN VAN Committed by Automerger Merge Worker
Browse files

Merge "Use doIpv6Provisioning in testPref64Option." am: b6db57bb 

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

Change-Id: I15629c8a86042162d4588598a519e52242ea2036
parents d010b417 b6db57bb

tests/integration/src/android/net/ip/IpClientIntegrationTest.java

+1 −8
Original line number Diff line number Diff line
@@ -1528,20 +1528,13 @@ public class IpClientIntegrationTest { 
        ByteBuffer pref64 = new StructNdOptPref64(prefix, 600).toByteBuffer();

        ByteBuffer ra = buildRaPacket(pio, rdnss, pref64);



        waitForRouterSolicitation();

        mPacketReader.sendResponse(ra);



        // The NAT64 prefix might be detected before or after provisioning success.

        // Don't test order between these two events.

        ArgumentCaptor<LinkProperties> captor = ArgumentCaptor.forClass(LinkProperties.class);

        verifyWithTimeout(null /*inOrder*/, mCb).onProvisioningSuccess(captor.capture());

        LinkProperties lp = doIpv6OnlyProvisioning(null /*inOrder*/, ra);

        expectAlarmSet(null /*inOrder*/, "PREF64", 600);

        reset(mCb, mAlarm);



        // From now on expect events in order.

        InOrder inOrder = inOrder(mCb, mAlarm);



        LinkProperties lp = captor.getValue();

        if (lp.getNat64Prefix() != null) {

            assertEquals(prefix, lp.getNat64Prefix());

        } else {