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

Commit ae245508 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Prevent tests with reboot from running during presubmit" am: 6916f91f... 

Merge "Prevent tests with reboot from running during presubmit" am: 6916f91f am: 131d03d6 am: 057bac27 am: 109836d6

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1580533

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic4709bdaa6bf8bd4319119cf99592ae313578da8
parents b6e30c03 109836d6

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-large": [

    {

      "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
@@ -25,6 +25,7 @@ import static org.junit.Assert.fail; 
import static org.junit.Assume.assumeTrue;



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

import android.platform.test.annotations.LargeTest;



import com.android.compatibility.common.tradefed.build.CompatibilityBuildHelper;

import com.android.ddmlib.Log;
@@ -201,6 +202,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());