Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: 3d423c9c39

Change-Id: If8173e2b320e252ac9dcb95d1967472d505f1121
This commit is contained in:
Hugo Benichi
2017-07-21 08:21:48 +00:00
committed by android-build-merger
parent 80aaf8fa37 3d423c9c39
commit 8b8a0ef586
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/net/java/android/net/ip/IpManagerTest.java
View File

@@ -22,6 +22,7 @@ import static org.mockito.Mockito.any;
import static org.mockito.Mockito.eq; import static org.mockito.Mockito.eq;
import static org.mockito.Mockito.mock; import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never; import static org.mockito.Mockito.never;
import static org.mockito.Mockito.reset;
import static org.mockito.Mockito.timeout; import static org.mockito.Mockito.timeout;
import static org.mockito.Mockito.times; import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verify;
@@ -93,6 +94,7 @@ public class IpManagerTest {
final IpManager ipm = new IpManager(mContext, ifname, mCb, mNMService); final IpManager ipm = new IpManager(mContext, ifname, mCb, mNMService);
verify(mNMService, timeout(100).times(1)).disableIpv6(ifname); verify(mNMService, timeout(100).times(1)).disableIpv6(ifname);
verify(mNMService, timeout(100).times(1)).clearInterfaceAddresses(ifname); verify(mNMService, timeout(100).times(1)).clearInterfaceAddresses(ifname);
reset(mNMService);
return ipm; return ipm;
} }