aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHuiling Chi <huilingchi@google.com>2022-03-31 02:00:17 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2022-03-31 02:00:17 +0000
commit93ccd3c2deb7e68c1ddb6229ba44ac7bc4a89c66 (patch)
tree68b5be146bf1ef47883b7f6ad884d01455da22cc
parent53f38b65ad7304811f67201164d7abd74763c354 (diff)
parent0f8c4a169b79f8f740856e7501d6bcbcf61ccf06 (diff)
downloadcsuite-93ccd3c2deb7e68c1ddb6229ba44ac7bc4a89c66.tar.gz
Remove AppSetupPreparer from test configs for Pixel App Compat. am: 72e817ae2e am: b1ed7fa5dc am: 5e21eef6f7 am: 0f8c4a169b
Original change: https://android-review.googlesource.com/c/platform/test/app_compat/csuite/+/2043064 Change-Id: I53335af489affd7075d7f214e54dcdb0aa346aef 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">