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

Commit 8b8a0ef5 authored by Hugo Benichi's avatar Hugo Benichi Committed by android-build-merger
Browse files

Merge "IpManagerTest: fix flaky test for real" am: e0a743d0 

am: 3d423c9c

Change-Id: If8173e2b320e252ac9dcb95d1967472d505f1121
parents 80aaf8fa 3d423c9c

tests/net/java/android/net/ip/IpManagerTest.java

+2 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ import static org.mockito.Mockito.any; 
import static org.mockito.Mockito.eq;

import static org.mockito.Mockito.mock;

import static org.mockito.Mockito.never;

import static org.mockito.Mockito.reset;

import static org.mockito.Mockito.timeout;

import static org.mockito.Mockito.times;

import static org.mockito.Mockito.verify;
@@ -93,6 +94,7 @@ public class IpManagerTest { 
        final IpManager ipm = new IpManager(mContext, ifname, mCb, mNMService);

        verify(mNMService, timeout(100).times(1)).disableIpv6(ifname);

        verify(mNMService, timeout(100).times(1)).clearInterfaceAddresses(ifname);

        reset(mNMService);

        return ipm;

    }