Merge "Extend ExpensiveObjectsPerfTest timeouts." am: 79572ee42e

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2640111

Change-Id: I01a5ae4dbc5ed66130b01a8352ed8dffce7d2995
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Miguel Aranda
2023-06-28 09:43:50 +00:00
committed by Automerger Merge Worker

View File

@@ -52,7 +52,7 @@ public class ExpensiveObjectsPerfTest {
}
}
@Test(timeout = 900)
@Test(timeout = 900000)
public void timeClonedDateFormatTimeInstance() {
DateFormat df = DateFormat.getTimeInstance(DateFormat.SHORT);
BenchmarkState state = mPerfStatusReporter.getBenchmarkState();
@@ -72,7 +72,7 @@ public class ExpensiveObjectsPerfTest {
}
}
@Test
@Test(timeout = 900000)
public void timeNewCollator() {
BenchmarkState state = mPerfStatusReporter.getBenchmarkState();
while (state.keepRunning()) {