joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge "Relax testValidation pass condition" into main am: cc2cfd252d

Browse source 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2845494

Change-Id: I3c6452ea7f4eec93f176383e9f5c3a024bc4efcd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot 2023-11-24 03:44:00 +00:00 • committed by Automerger Merge Worker
commit 4cc304e025
1 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -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