aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHuiling Chi <huilingchi@google.com>2022-03-31 01:15:00 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2022-03-31 01:15:00 +0000
commit5e21eef6f7ce5e3e426ddc6fbdbbbc0fe07196d9 (patch)
treeab568a8d8ff21975957f66d11953146614ff2dbb
parent76382885851c2406a506c8c83617580e7486a3d0 (diff)
parentb1ed7fa5dc07e609f5235d236e0fec4821baae05 (diff)
downloadcsuite-5e21eef6f7ce5e3e426ddc6fbdbbbc0fe07196d9.tar.gz
Remove AppSetupPreparer from test configs for Pixel App Compat. am: 72e817ae2e am: b1ed7fa5dc
Original change: https://android-review.googlesource.com/c/platform/test/app_compat/csuite/+/2043064 Change-Id: Ia25a88f213430ace805a4bf7928c0fa8638e32f5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--test_targets/pixel-app-launch-lock/template.xml5
-rw-r--r--test_targets/pixel-app-launch-recentapp/template.xml5
-rw-r--r--test_targets/pixel-app-launch-rotate/template.xml5
3 files changed, 3 insertions, 12 deletions
diff --git a/test_targets/pixel-app-launch-lock/template.xml b/test_targets/pixel-app-launch-lock/template.xml
index 779cde4..7751426 100644
--- a/test_targets/pixel-app-launch-lock/template.xml
+++ b/test_targets/pixel-app-launch-lock/template.xml
@@ -13,13 +13,10 @@
limitations under the License.
-->
<configuration description="Launches an app and lock/unlock the device">
- <option name="package-name" value="{package}"/>
- <target_preparer class="com.android.compatibility.targetprep.AppSetupPreparer">
- <option name="test-file-name" value="app://{package}"/>
- </target_preparer>
<target_preparer class="com.android.compatibility.targetprep.CheckGmsPreparer"/>
<target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
<option name="cleanup-apks" value="true" />
+ <option name="test-file-name" value="app://{package}"/>
<option name="test-file-name" value="PixelAppCompTests.apk" />
</target_preparer>
<metrics_collector class="com.android.tradefed.device.metric.FilePullerLogCollector">
diff --git a/test_targets/pixel-app-launch-recentapp/template.xml b/test_targets/pixel-app-launch-recentapp/template.xml
index e9fbabe..86742b7 100644
--- a/test_targets/pixel-app-launch-recentapp/template.xml
+++ b/test_targets/pixel-app-launch-recentapp/template.xml
@@ -13,13 +13,10 @@
limitations under the License.
-->
<configuration description="Launches an app by tapping recent app key">
- <option name="package-name" value="{package}"/>
- <target_preparer class="com.android.compatibility.targetprep.AppSetupPreparer">
- <option name="test-file-name" value="app://{package}"/>
- </target_preparer>
<target_preparer class="com.android.compatibility.targetprep.CheckGmsPreparer"/>
<target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
<option name="cleanup-apks" value="true" />
+ <option name="test-file-name" value="app://{package}"/>
<option name="test-file-name" value="PixelAppCompTests.apk" />
</target_preparer>
<metrics_collector class="com.android.tradefed.device.metric.FilePullerLogCollector">
diff --git a/test_targets/pixel-app-launch-rotate/template.xml b/test_targets/pixel-app-launch-rotate/template.xml
index d4ced59..ff7871a 100644
--- a/test_targets/pixel-app-launch-rotate/template.xml
+++ b/test_targets/pixel-app-launch-rotate/template.xml
@@ -13,13 +13,10 @@
limitations under the License.
-->
<configuration description="Launches an app, rotate screen, and check for crashes">
- <option name="package-name" value="{package}"/>
- <target_preparer class="com.android.compatibility.targetprep.AppSetupPreparer">
- <option name="test-file-name" value="app://{package}"/>
- </target_preparer>
<target_preparer class="com.android.compatibility.targetprep.CheckGmsPreparer"/>
<target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
<option name="cleanup-apks" value="true" />
+ <option name="test-file-name" value="app://{package}"/>
<option name="test-file-name" value="PixelAppCompTests.apk" />
</target_preparer>
<metrics_collector class="com.android.tradefed.device.metric.FilePullerLogCollector">