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

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

Merge changes Icf3a5583,Idd0fd1cc 

* changes:
  Increase sleep timeout of testNetworkFailedRollback_Phase3 (4/n)
  Do a reboot before starting each test (3/n)
parents 2670fcaf 887b2574

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

+2 −2
Original line number Diff line number Diff line
@@ -251,11 +251,11 @@ public class StagedRollbackTest { 


    @Test

    public void testNetworkFailedRollback_Phase3() throws Exception {

        // Sleep for > health check deadline

        // Sleep for > health check deadline (120s to trigger rollback + 120s to reboot)

        // 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(120));

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

    }



    @Test

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

+6 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ import static org.testng.Assert.assertThrows; 
import com.android.tradefed.testtype.DeviceJUnit4ClassRunner;

import com.android.tradefed.testtype.junit4.BaseHostJUnit4Test;



import org.junit.Before;

import org.junit.Ignore;

import org.junit.Test;

import org.junit.runner.RunWith;
@@ -47,6 +48,11 @@ public class StagedRollbackTest extends BaseHostJUnit4Test { 
                    phase));

    }



    @Before

    public void setUp() throws Exception {

        getDevice().reboot();

    }



    /**

     * Tests watchdog triggered staged rollbacks involving only apks.

     */