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

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

Merge "Uninstall testapps before running SecondaryUserRollbackTest"

parents 6f3ca535 cfdc04be

tests/RollbackTest/SecondaryUserRollbackTest.xml

+4 −0
Original line number Diff line number Diff line
@@ -19,6 +19,10 @@ 
        <option name="cleanup-apks" value="true" />

        <option name="test-file-name" value="RollbackTest.apk" />

    </target_preparer>

    <target_preparer class="com.android.tradefed.targetprep.RunCommandTargetPreparer">

        <option name="run-command" value="pm uninstall com.android.cts.install.lib.testapp.A" />

        <option name="run-command" value="pm uninstall com.android.cts.install.lib.testapp.B" />

    </target_preparer>

    <test class="com.android.tradefed.testtype.HostTest" >

        <option name="class" value="com.android.tests.rollback.host.SecondaryUserRollbackTest" />

    </test>

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

+2 −2
Original line number Diff line number Diff line
@@ -43,8 +43,8 @@ public class SecondaryUserRollbackTest extends BaseHostJUnit4Test { 
    @After

    public void tearDown() throws Exception {

        getDevice().switchUser(mOriginalUser);

        getDevice().executeShellCommand("pm uninstall com.android.tests.rollback.testapp.A");

        getDevice().executeShellCommand("pm uninstall com.android.tests.rollback.testapp.B");

        getDevice().executeShellCommand("pm uninstall com.android.cts.install.lib.testapp.A");

        getDevice().executeShellCommand("pm uninstall com.android.cts.install.lib.testapp.B");

        removeSecondaryUserIfNecessary();

    }