| commit | fcf54cf9668a949573e2b27146fbd53c4db85290 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Thu Mar 25 02:36:19 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Mar 25 02:36:19 2021 +0000 |
| tree | 801585e40b05d63d1070ff1f4755fbf914437e1a | |
| parent | 3bad6f98569a0dcf300cfa30ec933855f9419dc0 [diff] | |
| parent | 7ffa156a732ecd7e165742473c1ed865bcf32c93 [diff] |
Merge "Use a longer test timeout in integration test" am: f652408e6c am: 7ffa156a73 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1650287 Change-Id: Iac1fdb3d92501b292ecbff1f9a75bcecbcb23725
diff --git a/tests/net/integration/src/com/android/server/net/integrationtests/ConnectivityServiceIntegrationTest.kt b/tests/net/integration/src/com/android/server/net/integrationtests/ConnectivityServiceIntegrationTest.kt index db49e0b..b6e4274 100644 --- a/tests/net/integration/src/com/android/server/net/integrationtests/ConnectivityServiceIntegrationTest.kt +++ b/tests/net/integration/src/com/android/server/net/integrationtests/ConnectivityServiceIntegrationTest.kt
@@ -73,7 +73,7 @@ import kotlin.test.fail const val SERVICE_BIND_TIMEOUT_MS = 5_000L -const val TEST_TIMEOUT_MS = 1_000L +const val TEST_TIMEOUT_MS = 10_000L /** * Test that exercises an instrumented version of ConnectivityService against an instrumented