commit be3000bc35e78164eae0d264287e0f401acd0a70
author Jeff Sharkey <jsharkey@google.com> Thu Sep 14 16:56:06 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Sep 14 16:56:06 2017 +0000
tree 0af39c5596926f585d2183f4914ad832ef0fdaa6
parent c7779d69ab01c7acc4eb14f5d7b56fe286fddd1d
parent 459e28159cc4cf7878b474d2d090d716d0688e1e

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

Change-Id: I8177cc215297566af2fb9ac206c5c425071fd3aa

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 5eaf31b..b38eb0f 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
@@ -612,11 +612,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);