Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 15c8b4eb authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "UserLifecycleTests: use test-timeout"

parents 15382848 bc396263
Loading
Loading
Loading
Loading
+3 −0
Original line number Diff line number Diff line
@@ -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. -->
+2 −2
Original line number Diff line number Diff line
@@ -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;