| commit | c296c468433346fedb4d10c85f65b7c18a00d3b8 | [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 | 3408acd8539b4055764f3f18354b785553826bfb | |
| parent | d10200305b1659aadf5606bced22df90bc1663e9 [diff] | |
| parent | 660a2c96420653d5280c48e706ed03de36745cb5 [diff] |
Merge "Use a longer test timeout in integration test" am: 565f1a95bd am: e7da14afc4 am: 660a2c9642 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 14dddcbd..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