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

Commit 3ac333f2 authored by JW Wang's avatar JW Wang
Browse files

Rewrite how we abandon sessions 

The original code is flawed in that `pm install-abandon` only abandons
the 1st session returned by `pm get-stagedsessions ...`.

1. move AbandonSessionsRule to be shared by multiple host tests
2. use AbandonSessionsRule to do the job

Bug: 160754072
Test: StagedInstallInternalTest
Change-Id: Ib7b32fbd7b1133ac6a8e6782234a4fe2c5a782bd
parent f627c043

tests/RollbackTest/Android.bp

+7 −2
Original line number Diff line number Diff line
@@ -29,7 +29,12 @@ java_test_host { 
    name: "StagedRollbackTest",

    srcs: ["StagedRollbackTest/src/**/*.java"],

    libs: ["tradefed"],

    static_libs: ["testng", "compatibility-tradefed", "RollbackTestLib"],

    static_libs: [

        "compatibility-tradefed",

        "frameworks-base-hostutils",

        "RollbackTestLib",

        "testng",

    ],

    test_suites: ["general-tests"],

    test_config: "StagedRollbackTest.xml",

    data: [":com.android.apex.apkrollback.test_v1"],
@@ -39,7 +44,7 @@ java_test_host { 
    name: "NetworkStagedRollbackTest",

    srcs: ["NetworkStagedRollbackTest/src/**/*.java"],

    libs: ["tradefed"],

    static_libs: ["RollbackTestLib"],

    static_libs: ["RollbackTestLib", "frameworks-base-hostutils"],

    test_suites: ["general-tests"],

    test_config: "NetworkStagedRollbackTest.xml",

}

tests/StagedInstallTest/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ java_test_host { 
    name: "StagedInstallInternalTest",

    srcs: ["src/**/*.java"],

    libs: ["tradefed"],

    static_libs: ["testng", "compatibility-tradefed"],

    static_libs: ["testng", "compatibility-tradefed", "frameworks-base-hostutils"],

    test_suites: ["general-tests"],

    test_config: "StagedInstallInternalTest.xml",

}

tests/StagedInstallTest/src/com/android/tests/stagedinstallinternal/host/StagedInstallInternalTest.java

+8 −11
Original line number Diff line number Diff line
@@ -21,12 +21,14 @@ import static com.google.common.truth.Truth.assertThat; 
import static org.junit.Assert.assertTrue;



import com.android.ddmlib.Log;

import com.android.tests.rollback.host.AbandonSessionsRule;

import com.android.tradefed.testtype.DeviceJUnit4ClassRunner;

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

import com.android.tradefed.util.ProcessInfo;



import org.junit.After;

import org.junit.Before;

import org.junit.Rule;

import org.junit.Test;

import org.junit.runner.RunWith;
@@ -35,7 +37,9 @@ public class StagedInstallInternalTest extends BaseHostJUnit4Test { 


    private static final String TAG = StagedInstallInternalTest.class.getSimpleName();

    private static final long SYSTEM_SERVER_TIMEOUT_MS = 60 * 1000;

    private boolean mWasRoot = false;



    @Rule

    public AbandonSessionsRule mHostTestRule = new AbandonSessionsRule(this);



    /**

     * Runs the given phase of a test by calling into the device.
@@ -62,21 +66,11 @@ public class StagedInstallInternalTest extends BaseHostJUnit4Test { 


    @Before

    public void setUp() throws Exception {

        mWasRoot = getDevice().isAdbRoot();

        if (!mWasRoot) {

            getDevice().enableAdbRoot();

        }

        cleanUp();

        // Abandon all staged sessions

        getDevice().executeShellCommand("pm install-abandon $(pm get-stagedsessions --only-ready "

                + "--only-parent --only-sessionid)");

    }



    @After

    public void tearDown() throws Exception {

        if (!mWasRoot) {

            getDevice().disableAdbRoot();

        }

        cleanUp();

    }
@@ -90,7 +84,10 @@ public class StagedInstallInternalTest extends BaseHostJUnit4Test { 
    private void restartSystemServer() throws Exception {

        // Restart the system server

        long oldStartTime = getDevice().getProcessByName("system_server").getStartTime();



        getDevice().enableAdbRoot(); // Need root to restart system server

        assertThat(getDevice().executeShellCommand("am restart")).contains("Restart the system");

        getDevice().disableAdbRoot();



        // Wait for new system server process to start

        long start = System.currentTimeMillis();