commit ff47147c3a881a11f03f87c75bc2a7cf68f85857
author Chalard Jean <jchalard@google.com> Fri Oct 09 04:53:54 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Oct 09 04:53:54 2020 +0000
tree 7797ccc99291c712016daedfb9e68bdee4d85cf2
parent 45906d55cc99cc76c112968a68b1feeee004d4cb
parent 43370c622d8f5ae29e112144ac4219d744d2d7d1

Merge "Fix a way for this test to flake." am: 43370c622d

Original change: https://android-review.googlesource.com/c/platform/cts/+/1436794

Change-Id: I2318a6d1a6d6ac4b142fc998f0c5efbe93b68707

tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java

diff --git a/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java b/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java
index 4f42ccc..db4e3e7 100644
--- a/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java
+++ b/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java
@@ -224,6 +224,16 @@
         if (mCtsNetUtils.cellConnectAttempted()) {
             mCtsNetUtils.disconnectFromCell();
         }
+
+        // All tests in this class require a working Internet connection as they start. Make
+        // sure there is still one as they end that's ready to use for the next test to use.
+        final TestNetworkCallback callback = new TestNetworkCallback();
+        mCm.registerDefaultNetworkCallback(callback);
+        try {
+            assertNotNull("Couldn't restore Internet connectivity", callback.waitForAvailable());
+        } finally {
+            mCm.unregisterNetworkCallback(callback);
+        }
     }
 
     /**