diff options
| author | Elliot Sisteron <elliotsisteron@google.com> | 2023-07-20 13:21:44 +0000 |
|---|---|---|
| committer | Android Build Cherrypicker Worker <android-build-cherrypicker-worker@google.com> | 2023-10-23 11:10:50 +0000 |
| commit | 44676b762f885dd896e9f4dc056ab05dad6173d7 (patch) | |
| tree | 4bbf2664750cffdb7e012718633e0e2c30e00d35 | |
| parent | 6b1bcb49cd05f2d1bad469a05d444a9b5c9d9f3e (diff) | |
| download | Permission-44676b762f885dd896e9f4dc056ab05dad6173d7.tar.gz | |
Allow timeout to be even larger than 1 minute.
See b/276844473#comment8
Bug: 276844473
Test: atest SafetyCenterFuctionalMultiUsersTestCases
Relnote: N/A
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:a72037fb03778f25356fa19b4fe117335e8d9c65)
Merged-In: If16b2e93f9158767e7d6fb8a82d30a87a12e6595
Change-Id: If16b2e93f9158767e7d6fb8a82d30a87a12e6595
| -rw-r--r-- | tests/utils/safetycenter/java/com/android/safetycenter/testing/Coroutines.kt | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/tests/utils/safetycenter/java/com/android/safetycenter/testing/Coroutines.kt b/tests/utils/safetycenter/java/com/android/safetycenter/testing/Coroutines.kt index 18402e286..6c6336da3 100644 --- a/tests/utils/safetycenter/java/com/android/safetycenter/testing/Coroutines.kt +++ b/tests/utils/safetycenter/java/com/android/safetycenter/testing/Coroutines.kt @@ -19,7 +19,6 @@ package com.android.safetycenter.testing import android.util.Log import androidx.test.platform.app.InstrumentationRegistry import java.time.Duration -import kotlin.comparisons.minOf import kotlinx.coroutines.DEBUG_PROPERTY_NAME import kotlinx.coroutines.DEBUG_PROPERTY_VALUE_AUTO import kotlinx.coroutines.DEBUG_PROPERTY_VALUE_ON @@ -39,7 +38,7 @@ object Coroutines { /** A long timeout, to be used for actions that are expected to complete. */ val TIMEOUT_LONG: Duration - get() = minOf(TEST_TIMEOUT.dividedBy(2), Duration.ofMinutes(1)) + get() = TEST_TIMEOUT.dividedBy(2) /** A short timeout, to be used for actions that are expected not to complete. */ val TIMEOUT_SHORT: Duration = Duration.ofSeconds(1) |