Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie9e071da6ca9f3cbd3b6353b9f0bd817b8186d31
This commit is contained in:
Treehugger Robot
2021-02-16 12:25:24 +00:00
committed by Automerger Merge Worker
parent 4fb9af6ced 6916f91f55
commit 131d03d6bf
3 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/StagedInstallTest/StagedInstallInternalTest.xml
View File

@@ -15,7 +15,7 @@
~ limitations under the License. ~ limitations under the License.
--> -->
<configuration description="Runs the internal staged install tests"> <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"> <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
<option name="cleanup-apks" value="true" /> <option name="cleanup-apks" value="true" />
<option name="test-file-name" value="StagedInstallInternalTestApp.apk" /> <option name="test-file-name" value="StagedInstallInternalTestApp.apk" />

10
tests/StagedInstallTest/TEST_MAPPING
View File

@@ -1,5 +1,15 @@
{ {
"presubmit": [ "presubmit": [
{
"name": "StagedInstallInternalTest",
"options": [
{
"exclude-annotation": "android.platform.test.annotations.LargeTest"
}
]
}
],
"postsubmit": [
{ {
"name": "StagedInstallInternalTest" "name": "StagedInstallInternalTest"
} }

2
tests/StagedInstallTest/src/com/android/tests/stagedinstallinternal/host/StagedInstallInternalTest.java
View File

@@ -24,6 +24,7 @@ import static org.junit.Assert.assertTrue;
import static org.junit.Assume.assumeTrue; import static org.junit.Assume.assumeTrue;
import android.cts.install.lib.host.InstallUtilsHost; import android.cts.install.lib.host.InstallUtilsHost;
import android.platform.test.annotations.LargeTest;
import com.android.ddmlib.Log; import com.android.ddmlib.Log;
import com.android.tests.rollback.host.AbandonSessionsRule; 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 rollback-app command waits for staged sessions to be ready
@Test @Test
@LargeTest
public void testAdbRollbackAppWaitsForStagedReady() throws Exception { public void testAdbRollbackAppWaitsForStagedReady() throws Exception {
assumeTrue("Device does not support updating APEX", assumeTrue("Device does not support updating APEX",
mHostUtils.isApexUpdateSupported()); mHostUtils.isApexUpdateSupported());