Merge "Relax testValidation pass condition" into main

2023-11-24 03:31:29 +00:00 · 2023-11-24 03:31:29 +00:00 · cc2cfd252d
commit cc2cfd252d
parent 11162e97c6 9273ae0fd0
1 changed files with 6 additions and 1 deletions
--- 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 @@ class ConnectivityServiceIntegrationTest {
        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