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

Commit 6fb4ed10 authored by Lorenzo Colitti's avatar Lorenzo Colitti Committed by Automerger Merge Worker
Browse files

Use doIpv6Provisioning in testPref64Option. am: a8a73c53 am: 449c3af7 am: db602352

Change-Id: I983e9a8b0d0ceab3ad9de81a9464af25bcd3f721
parents 1cb2b6c0 db602352
Loading
Loading
Loading
Loading
+1 −8
Original line number Diff line number Diff line
@@ -1506,20 +1506,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 {