| commit | d39dd2f6aa689038878464591e2612ff0cdbb3bf | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Thu Mar 25 03:11:16 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Mar 25 03:11:16 2021 +0000 |
| tree | d4f5230bb4340c36cddab2069a33d53afd7cf584 | |
| parent | 746577e7dd128d19a5e4158a04203c6650ba01cd [diff] | |
| parent | fcf54cf9668a949573e2b27146fbd53c4db85290 [diff] |
Merge "Use a longer test timeout in integration test" am: f652408e6c am: 7ffa156a73 am: fcf54cf966 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1650287 Change-Id: Ie457ecaa93f96d221f75d4eb59d44bc7857c67fb
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 14dddcb..e039ef0 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