Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "UserLifecycleTests: use test-timeout"

Browse Source
This commit is contained in:
TreeHugger Robot
2021-09-09 23:26:18 +00:00
committed by Android (Google) Code Review
parent 1538284895 bc39626365
commit 15c8b4eb44
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
apct-tests/perftests/multiuser/AndroidTest.xml
View File

@@ -44,6 +44,9 @@
<option name="package" value="com.android.perftests.multiuser" />
<option name="hidden-api-checks" value="false"/>
<!-- Timeout individual tests only after 25m (rather than 10m default) for slow devices. -->
<option name="test-timeout" value="1500000" />
<!-- Listener related args for collecting the traces and waiting for the device to stabilize. -->
<option name="device-listeners" value="android.device.collectors.ProcLoadListener,android.device.collectors.PerfettoListener" />
<!-- Guarantee that user defined RunListeners will be running before any of the default listeners defined in this runner. -->

4
apct-tests/perftests/multiuser/src/android/multiuser/UserLifecycleTests.java
View File

@@ -89,8 +89,8 @@ public class UserLifecycleTests {
private static final String TAG = UserLifecycleTests.class.getSimpleName();
/** Max runtime for each test (including all runs within that test). */
// No point exceeding 10 minutes, since device would likely be considered non-responsive anyway.
private static final long TIMEOUT_MAX_TEST_TIME_MS = 9 * 60_000;
// Must be less than the AndroidTest.xml test-timeout to avoid being considered non-responsive.
private static final long TIMEOUT_MAX_TEST_TIME_MS = 24 * 60_000;
private static final int TIMEOUT_IN_SECOND = 30;
private static final int CHECK_USER_REMOVED_INTERVAL_MS = 200;