| commit | 7baa08fff48183d33e7ec70d93b2d153fd444112 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Fri Nov 29 09:42:38 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Nov 29 09:42:38 2024 +0000 |
| tree | a0b33fb103af42b9eaade664fb1ca2896bee89b7 | |
| parent | 90ef05c6ac2b977d07b23971cd34526199a5083f [diff] | |
| parent | bb3b38d71e2da139efe6ac32854e202b9e794102 [diff] |
Merge "Fix assertEventuallyTrue timeout" into main am: bb3b38d71e Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/3383368 Change-Id: Id7feaabdd7bc8c58573b46bff116c6ec6b518948 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/staticlibs/testutils/hostdevice/com/android/testutils/MiscAsserts.kt b/staticlibs/testutils/hostdevice/com/android/testutils/MiscAsserts.kt index d1d5649..176546a 100644 --- a/staticlibs/testutils/hostdevice/com/android/testutils/MiscAsserts.kt +++ b/staticlibs/testutils/hostdevice/com/android/testutils/MiscAsserts.kt
@@ -20,6 +20,7 @@ import com.android.testutils.FunctionalUtils.ThrowingRunnable import java.lang.reflect.Modifier +import java.util.concurrent.TimeUnit import java.util.function.BooleanSupplier import kotlin.system.measureTimeMillis import kotlin.test.assertEquals @@ -134,7 +135,7 @@ // on host). When waiting for a condition during tests the device would generally not go into // deep sleep, and the polling sleep would go over the timeout anyway in that case, so this is // fine. - val limit = System.nanoTime() + timeoutMs * 1000 + val limit = System.nanoTime() + TimeUnit.MILLISECONDS.toNanos(timeoutMs) while (!fn.asBoolean) { if (System.nanoTime() > limit) { fail(descr)