summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Treehugger Robot <treehugger-gerrit@google.com> 2021-03-25 02:36:19 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2021-03-25 02:36:19 +0000
commit660a2c96420653d5280c48e706ed03de36745cb5 (patch)
tree3f313e245d88628a862ee6f87677b875fb50bf48
parent25104d78240ad576d5acd831cd1f92974808515a (diff)
parente7da14afc452ac172e235933f7e77b042f4aeb57 (diff)
Merge "Use a longer test timeout in integration test" am: 565f1a95bd am: e7da14afc4
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1650287 Change-Id: Iac1fdb3d92501b292ecbff1f9a75bcecbcb23725
-rw-r--r--tests/net/integration/src/com/android/server/net/integrationtests/ConnectivityServiceIntegrationTest.kt2
1 files changed, 1 insertions, 1 deletions
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 db49e0b0047e..b6e42743e2a3 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.assertTrue
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