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

Commit 6916f91f authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Prevent tests with reboot from running during presubmit"

parents 80bbdfd1 d1884a05

tests/StagedInstallTest/StagedInstallInternalTest.xml

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
  ~ limitations under the License.

  -->

<configuration description="Runs the internal staged install tests">

    <option name="test-suite-tag" value="StagedInstallTest" />

    <option name="test-suite-tag" value="StagedInstallInternalTest" />

    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">

        <option name="cleanup-apks" value="true" />

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

tests/StagedInstallTest/TEST_MAPPING

+10 −0
Original line number Diff line number Diff line 
{

  "presubmit": [

    {

      "name": "StagedInstallInternalTest",

      "options": [

        {

          "exclude-annotation": "android.platform.test.annotations.LargeTest"

        }

      ]

    }

  ],

  "postsubmit": [

    {

      "name": "StagedInstallInternalTest"

    }

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

+2 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ import static org.junit.Assert.assertTrue; 
import static org.junit.Assume.assumeTrue;



import android.cts.install.lib.host.InstallUtilsHost;

import android.platform.test.annotations.LargeTest;



import com.android.ddmlib.Log;

import com.android.tests.rollback.host.AbandonSessionsRule;
@@ -141,6 +142,7 @@ public class StagedInstallInternalTest extends BaseHostJUnit4Test { 


    // Test rollback-app command waits for staged sessions to be ready

    @Test

    @LargeTest

    public void testAdbRollbackAppWaitsForStagedReady() throws Exception {

        assumeTrue("Device does not support updating APEX",

                mHostUtils.isApexUpdateSupported());