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

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

Skip tests if the shims are too old for them to pass. am: 5ce2db96 am: f4d040af am: fa1d2240 

Change-Id: I58b638712174ede812895253caaa92060ce58a08
parents 18db7bbc fa1d2240

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

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


import com.android.internal.util.StateMachine;

import com.android.networkstack.apishim.CaptivePortalDataShimImpl;

import com.android.networkstack.apishim.ConstantsShim;

import com.android.networkstack.apishim.ShimUtils;

import com.android.networkstack.arp.ArpPacket;

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


    @Test @IgnoreUpTo(Build.VERSION_CODES.Q)

    public void testDhcpServerInLinkProperties() throws Exception {

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



        performDhcpHandshake();

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

        verify(mCb, timeout(TEST_TIMEOUT_MS)).onProvisioningSuccess(captor.capture());
@@ -1385,6 +1388,8 @@ public class IpClientIntegrationTest { 


    @Test @IgnoreUpTo(Build.VERSION_CODES.Q)

    public void testPref64Option() throws Exception {

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



        disableRouterSolicitationDelay();



        ProvisioningConfiguration config = new ProvisioningConfiguration.Builder()