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

Commit 5304b78e authored by Remi NGUYEN VAN's avatar Remi NGUYEN VAN
Browse files

Fix testDhcpClientCaptivePortalApiEnabled flakes 

The test expected onLinkPropertiesChanged to be called several times (it
iterates on all values received by the captor), but missed specifying
"atLeastOnce" in the verify calls, so only a single call would be
allowed.

This fixes frequent flakes in automated test runs.

Fixes: 163102019
Test: atest NetworkStackIntegrationTests:IpClientIntegrationTest
Change-Id: I27136451fc144c1df3fe42a3d51a0df2e9ff02ca
parent cbd0e12f

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

+5 −3
Original line number Diff line number Diff line
@@ -66,6 +66,7 @@ import static org.mockito.ArgumentMatchers.contains; 
import static org.mockito.ArgumentMatchers.longThat;

import static org.mockito.Mockito.any;

import static org.mockito.Mockito.argThat;

import static org.mockito.Mockito.atLeastOnce;

import static org.mockito.Mockito.doAnswer;

import static org.mockito.Mockito.doThrow;

import static org.mockito.Mockito.eq;
@@ -2007,15 +2008,16 @@ public class IpClientIntegrationTest { 


        final Uri expectedUrl = featureEnabled && serverSendsOption

                ? Uri.parse(TEST_CAPTIVE_PORTAL_URL) : null;

        // Wait for LinkProperties containing DHCP-obtained info, such as MTU

        // LinkProperties will be updated multiple times. Wait for it to contain DHCP-obtained info,

        // such as MTU.

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

        verify(mCb, timeout(TEST_TIMEOUT_MS)).onLinkPropertiesChange(

        verify(mCb, timeout(TEST_TIMEOUT_MS).atLeastOnce()).onLinkPropertiesChange(

                argThat(lp -> lp.getMtu() == testMtu));



        // Ensure that the URL was set as expected in the callbacks.

        // Can't verify the URL up to Q as there is no such attribute in LinkProperties.

        if (!ShimUtils.isAtLeastR()) return;

        verify(mCb).onLinkPropertiesChange(captor.capture());

        verify(mCb, atLeastOnce()).onLinkPropertiesChange(captor.capture());

        assertTrue(captor.getAllValues().stream().anyMatch(

                lp -> Objects.equals(expectedUrl, lp.getCaptivePortalApiUrl())));

    }