commit 242935cb8521bb05b9e4119daa36a9b60514d8b4
author Jeff Sharkey <jsharkey@google.com> Fri Sep 15 04:17:16 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Sep 15 04:17:16 2017 +0000
tree 8cfc613c321e721ec7968b0dec2b9eaece5921ed
parent d74aab502f4eabd587965f64f37b0577ff604b34
parent be3000bc35e78164eae0d264287e0f401acd0a70

Merge "Fix flaky CtsHostsideNetworkTests." into oc-mr1-dev am: 91b52b4043
am: be3000bc35

Change-Id: I6c7005cd424b42367c8576f107b9c1e98ecac2e4

tests/cts/hostside/app/src/com/android/cts/net/hostside/AbstractRestrictBackgroundNetworkTestCase.java

diff --git a/tests/cts/hostside/app/src/com/android/cts/net/hostside/AbstractRestrictBackgroundNetworkTestCase.java b/tests/cts/hostside/app/src/com/android/cts/net/hostside/AbstractRestrictBackgroundNetworkTestCase.java
index cd0c4f3..aadf239 100644
--- a/tests/cts/hostside/app/src/com/android/cts/net/hostside/AbstractRestrictBackgroundNetworkTestCase.java
+++ b/tests/cts/hostside/app/src/com/android/cts/net/hostside/AbstractRestrictBackgroundNetworkTestCase.java
@@ -614,11 +614,15 @@
         NetworkInfo info = null;
         for (int i = 1; i <= maxTries; i++) {
             info = mCm.getActiveNetworkInfo();
-            if (info != null) {
+            if (info == null) {
+                Log.v(TAG, "No active network info on attempt #" + i
+                        + "; sleeping 1s before polling again");
+            } else if (mCm.isActiveNetworkMetered() != expected) {
+                Log.v(TAG, "Wrong metered status for active network " + info + "; expected="
+                        + expected + "; sleeping 1s before polling again");
+            } else {
                 break;
             }
-            Log.v(TAG, "No active network info on attempt #" + i
-                    + "; sleeping 1s before polling again");
             Thread.sleep(SECOND_IN_MS);
         }
         assertNotNull("No active network after " + maxTries + " attempts", info);