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

Commit 5f01cb92 authored by Richard Uhler's avatar Richard Uhler Committed by Bill Lin
Browse files

Increase timeout in testNativeWatchdogTriggersRollback 

Bumps a timeout from 1 minute to 5 minutes, because in practice a lot
more needs to happen in that time window than we expect to fit in 1
minute.

Bug: 140223710
Test: atest StagedRollbackTest:com.android.tests.rollback.host.StagedRollbackTest#testNativeWatchdogTriggersRollback
Change-Id: I2e937f8e1f87356815a834241ad5e9ec1e953892
Merged-In: I2a98e71102fc1cbf6ea712e070d6db49cdb05cba
parent 1d66bf8c

tests/RollbackTest/StagedRollbackTest/src/com/android/tests/rollback/host/StagedRollbackTest.java

+11 −3
Original line number Diff line number Diff line
@@ -29,6 +29,8 @@ import org.junit.Before; 
import org.junit.Test;

import org.junit.runner.RunWith;



import java.util.concurrent.TimeUnit;



/**

 * Runs the staged rollback tests.

 */
@@ -100,9 +102,15 @@ public class StagedRollbackTest extends BaseHostJUnit4Test { 
        // crash system_server enough times to trigger a rollback

        crashProcess("system_server", NATIVE_CRASHES_THRESHOLD);



        // Rollback should be committed automatically now

        // Give time for rollback to be committed

        assertTrue(getDevice().waitForDeviceNotAvailable(60000));

        // Rollback should be committed automatically now.

        // Give time for rollback to be committed. This could take a while,

        // because we need all of the following to happen:

        // 1. system_server comes back up and boot completes.

        // 2. Rollback health observer detects updatable crashing signal.

        // 3. Staged rollback session becomes ready.

        // 4. Device actually reboots.

        // So we give a generous timeout here.

        assertTrue(getDevice().waitForDeviceNotAvailable(TimeUnit.MINUTES.toMillis(5)));

        getDevice().waitForDeviceAvailable();



        // verify rollback committed