commit 34ad34d19998f6b4cd4d65047d41be3bc5e3e321
author Hugo Benichi <hugobenichi@google.com> Fri Jul 21 08:26:49 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Jul 21 08:26:49 2017 +0000
tree 31f93f529893ce6b3c2adca8340ad058c2f379e8
parent 30f2df2f34616728fa4619bf15fc6a4599fa725a
parent 8b8a0ef58634104dfeae955f87bdc638f6d96dac

Merge "IpManagerTest: fix flaky test for real" am: e0a743d035 am: 3d423c9c39
am: 8b8a0ef586

Change-Id: I63414de17f71be8f8e24296ba820f5e855f2975f

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;
     }