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

Commit 4e86daf4 authored by Lorenzo Colitti's avatar Lorenzo Colitti Committed by Gerrit Code Review
Browse files

Merge "Skip tests if the shims are too old for them to pass."

parents 843ef706 75aac04c

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

+5 −0
Original line number Original line Diff line number Diff line
@@ -127,6 +127,7 @@ import androidx.test.runner.AndroidJUnit4; 




import com.android.internal.util.StateMachine;

import com.android.internal.util.StateMachine;

import com.android.networkstack.apishim.CaptivePortalDataShimImpl;

import com.android.networkstack.apishim.CaptivePortalDataShimImpl;

import com.android.networkstack.apishim.ConstantsShim;

import com.android.networkstack.apishim.ShimUtils;

import com.android.networkstack.apishim.ShimUtils;

import com.android.networkstack.arp.ArpPacket;

import com.android.networkstack.arp.ArpPacket;

import com.android.server.NetworkObserverRegistry;

import com.android.server.NetworkObserverRegistry;
@@ -1086,6 +1087,8 @@ public class IpClientIntegrationTest { 




    @Test @IgnoreUpTo(Build.VERSION_CODES.Q)

    @Test @IgnoreUpTo(Build.VERSION_CODES.Q)

    public void testDhcpServerInLinkProperties() throws Exception {

    public void testDhcpServerInLinkProperties() throws Exception {

        assumeTrue(ConstantsShim.VERSION > Build.VERSION_CODES.Q);



        performDhcpHandshake();

        performDhcpHandshake();

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

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

        verify(mCb, timeout(TEST_TIMEOUT_MS)).onProvisioningSuccess(captor.capture());

        verify(mCb, timeout(TEST_TIMEOUT_MS)).onProvisioningSuccess(captor.capture());
@@ -1361,6 +1364,8 @@ public class IpClientIntegrationTest { 
    @Ignore  // AOSP kernels don't support the PREF64 option yet.

    @Ignore  // AOSP kernels don't support the PREF64 option yet.

    @Test @IgnoreUpTo(Build.VERSION_CODES.Q)

    @Test @IgnoreUpTo(Build.VERSION_CODES.Q)

    public void testPref64Option() throws Exception {

    public void testPref64Option() throws Exception {

        assumeTrue(ConstantsShim.VERSION > Build.VERSION_CODES.Q);



        disableRouterSolicitationDelay();

        disableRouterSolicitationDelay();





        ProvisioningConfiguration config = new ProvisioningConfiguration.Builder()

        ProvisioningConfiguration config = new ProvisioningConfiguration.Builder()