summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Treehugger Robot <treehugger-gerrit@google.com> 2021-03-25 01:24:51 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2021-03-25 01:24:51 +0000
commit565f1a95bdec38c3df0f2d0cabbf6875fd036f7b (patch)
tree3d9eb77edbadb83c5ab4e5d3cade01af72943097
parent92f92c7ce0c3a234c7dca92e68a1a969001a6de9 (diff)
parentdca6562c8f4d9a106e02360228afc1fde6d35042 (diff)
Merge "Use a longer test timeout in integration test"
-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