Merge "Extend ExpensiveObjectsPerfTest timeouts."

This commit is contained in:
Miguel Aranda
2023-06-28 09:04:15 +00:00
committed by Gerrit Code Review

View File

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