commit 3d423c9c3965b6c4d9f5e2a23b002ae20d9983a1
author Hugo Benichi <hugobenichi@google.com> Fri Jul 21 08:15:20 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Jul 21 08:15:20 2017 +0000
tree e9639638cbde293825cba83c010abc38e9c7b23e
parent 42199bf5a06f8efe4aa1d4eac2f917b5ad389511
parent e0a743d035376a5477661b5e7b317b278724c99d

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

Change-Id: If1e0024d81bb24586f2cbd691e39a2d66f827c41

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

diff --git a/tests/net/java/android/net/ip/IpManagerTest.java b/tests/net/java/android/net/ip/IpManagerTest.java
index 867324d..dc77e22 100644
--- a/tests/net/java/android/net/ip/IpManagerTest.java
+++ b/tests/net/java/android/net/ip/IpManagerTest.java
@@ -22,6 +22,7 @@
 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 @@
         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;
     }