| commit | e7da14afc452ac172e235933f7e77b042f4aeb57 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Thu Mar 25 01:53:51 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Mar 25 01:53:51 2021 +0000 |
| tree | 3d9eb77edbadb83c5ab4e5d3cade01af72943097 | |
| parent | 8dd68b73cc963d85b14754b29e3f27de5f1a640e [diff] | |
| parent | 565f1a95bdec38c3df0f2d0cabbf6875fd036f7b [diff] |
Merge "Use a longer test timeout in integration test" am: 565f1a95bd Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1650287 Change-Id: Ia76f196039f7d748f47bd4e9a62eb59c8ad1b116
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