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

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

Merge "Reduce the health check timeout (2/n)"

parents b051671a b4540e2d

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

+1 −1
Original line number Diff line number Diff line
@@ -243,7 +243,7 @@ public class StagedRollbackTest { 
        // The device is expected to reboot during sleeping. This device method will fail and

        // the host will catch the assertion. If reboot doesn't happen, the host will fail the

        // assertion.

        Thread.sleep(TimeUnit.SECONDS.toMillis(260));

        Thread.sleep(TimeUnit.SECONDS.toMillis(120));

    }



    @Test

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

+1 −1
Original line number Diff line number Diff line
@@ -125,7 +125,7 @@ public class StagedRollbackTest extends BaseHostJUnit4Test { 
        runPhase("testNetworkFailedRollback_Phase1");

        // Reduce health check deadline

        getDevice().executeShellCommand("device_config put rollback "

                + "watchdog_request_timeout_millis 300000");

                + "watchdog_request_timeout_millis 120000");

        // Simulate re-installation of new NetworkStack with rollbacks enabled

        getDevice().executeShellCommand("pm install -r --staged --enable-rollback "

                + "/system/priv-app/NetworkStack/NetworkStack.apk");