commit cc2cfd252d176b24025d7d6da1501ffca86bb011
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Fri Nov 24 03:31:29 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Nov 24 03:31:29 2023 +0000
tree d7cd62a7b1ec14033150ca77822f9c44cca98318
parent 11162e97c65a28cc15b10240e94e29e41cc6f8d0
parent 9273ae0fd0e11ec70442e559b336331fa3aa6ddb

Merge "Relax testValidation pass condition" into main

tests/integration/src/com/android/server/net/integrationtests/ConnectivityServiceIntegrationTest.kt

diff --git a/tests/integration/src/com/android/server/net/integrationtests/ConnectivityServiceIntegrationTest.kt b/tests/integration/src/com/android/server/net/integrationtests/ConnectivityServiceIntegrationTest.kt
index 9b082a4..496d163 100644
--- a/tests/integration/src/com/android/server/net/integrationtests/ConnectivityServiceIntegrationTest.kt
+++ b/tests/integration/src/com/android/server/net/integrationtests/ConnectivityServiceIntegrationTest.kt
@@ -255,7 +255,12 @@
         na.connect()
 
         testCallback.expectAvailableThenValidatedCallbacks(na.network, TEST_TIMEOUT_MS)
-        assertEquals(2, nsInstrumentation.getRequestUrls().size)
+        val requestedSize = nsInstrumentation.getRequestUrls().size
+        if (requestedSize == 2 || (requestedSize == 1 &&
+                nsInstrumentation.getRequestUrls()[0] == httpsProbeUrl)) {
+            return
+        }
+        fail("Unexpected request urls: ${nsInstrumentation.getRequestUrls()}")
     }
 
     @Test