| commit | 9a6fa019ecc0bd220d8702aead50c41b3e57dd8b | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Fri Nov 24 04:30:46 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Nov 24 04:30:46 2023 +0000 |
| tree | ff53cf225a3b383828c4ced00dc28243ee66bc87 | |
| parent | 36dbb99403527b15c6eb9618fe9ef303eb4e5fc7 [diff] | |
| parent | cc2cfd252d176b24025d7d6da1501ffca86bb011 [diff] |
Merge "Relax testValidation pass condition" into main am: cc2cfd252d Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2845494 Change-Id: I7ac3d696e8631ec9f70a527c1885c8f83385c4d3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
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