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

Commit 5a6df151 authored by Richard Uhler's avatar Richard Uhler Committed by android-build-merger
Browse files

Increase timeout in testNativeWatchdogTriggersRollback

am: 5f01cb92

Change-Id: I4677f053787074ef445bba8d18ace8ad66c711ff
parents 79e8fcb4 5f01cb92
Loading
Loading
Loading
Loading
+11 −3
Original line number Original line Diff line number Diff line
@@ -30,6 +30,8 @@ import org.junit.Ignore;
import org.junit.Test;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runner.RunWith;


import java.util.concurrent.TimeUnit;

/**
/**
 * Runs the staged rollback tests.
 * Runs the staged rollback tests.
 */
 */
@@ -102,9 +104,15 @@ public class StagedRollbackTest extends BaseHostJUnit4Test {
        // crash system_server enough times to trigger a rollback
        // crash system_server enough times to trigger a rollback
        crashProcess("system_server", NATIVE_CRASHES_THRESHOLD);
        crashProcess("system_server", NATIVE_CRASHES_THRESHOLD);


        // Rollback should be committed automatically now
        // Rollback should be committed automatically now.
        // Give time for rollback to be committed
        // Give time for rollback to be committed. This could take a while,
        assertTrue(getDevice().waitForDeviceNotAvailable(60000));
        // 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();
        getDevice().waitForDeviceAvailable();


        // verify rollback committed
        // verify rollback committed