commit e9e871ef83ba02cb013540e5aa204850c903fe28
author Junyu Lai <junyulai@google.com> Wed Mar 18 08:41:08 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Mar 18 08:41:08 2020 +0000
tree 25ca233d1dffa3b4bee08f7b4e8a70cecdeb9c68
parent b76fc089d759fb5c27f8e52b85198aee51d86a54
parent 7bd2a24dab9c57b98991c6b5ce6f6030f29bd1d2

Merge "Fix flaky ConnectivityServiceTest#testNetworkFactoryUnregister"

tests/net/java/com/android/server/ConnectivityServiceTest.java

diff --git a/tests/net/java/com/android/server/ConnectivityServiceTest.java b/tests/net/java/com/android/server/ConnectivityServiceTest.java
index e04051f..9dc0a62 100644
--- a/tests/net/java/com/android/server/ConnectivityServiceTest.java
+++ b/tests/net/java/com/android/server/ConnectivityServiceTest.java
@@ -2465,8 +2465,8 @@
             final MockNetworkFactory testFactory = new MockNetworkFactory(handlerThread.getLooper(),
                     mServiceContext, "testFactory", filter);
             // Register the factory and don't be surprised when the default request arrives.
-            testFactory.register();
             testFactory.expectAddRequestsWithScores(0);
+            testFactory.register();
             testFactory.waitForNetworkRequests(1);
 
             testFactory.setScoreFilter(42);