[cts] use PushFilePreparer to push idsig files instead of FilePusher
To be consistent with the APK files.
BUG: 152888086
Test: atest CtsContentTestCases:android.content.cts.ContentQueryMapTest#testSetKeepUpdated -- --abi arm64-v8a
(Passes)
Change-Id: I7b4c45faf903316bcbaf124f01bd5d621ab9a4c1
diff --git a/tests/tests/content/AndroidTest.xml b/tests/tests/content/AndroidTest.xml
index 80986b5..7c0f3ac 100644
--- a/tests/tests/content/AndroidTest.xml
+++ b/tests/tests/content/AndroidTest.xml
@@ -39,35 +39,33 @@
<target_preparer class="com.android.tradefed.targetprep.PushFilePreparer">
<option name="cleanup" value="true" />
+ <!-- idsig files might not be found, ignore the push failure -->
+ <!-- TODO(b/152888086): remove this after cts build process enables idsig files -->
+ <option name="abort-on-push-failure" value="false" />
<option name="push-file" key="HelloWorld5.apk" value="/data/local/tmp/cts/content/HelloWorld5.apk" />
+ <option name="push-file" key="HelloWorld5.apk.idsig" value="/data/local/tmp/cts/content/HelloWorld5.apk.idsig" />
<option name="push-file" key="HelloWorld5_hdpi-v4.apk" value="/data/local/tmp/cts/content/HelloWorld5_hdpi-v4.apk" />
+ <option name="push-file" key="HelloWorld5_hdpi-v4.apk.idsig" value="/data/local/tmp/cts/content/HelloWorld5_hdpi-v4.apk.idsig" />
<option name="push-file" key="HelloWorld5_mdpi-v4.apk" value="/data/local/tmp/cts/content/HelloWorld5_mdpi-v4.apk" />
+ <option name="push-file" key="HelloWorld5_mdpi-v4.apk.idsig" value="/data/local/tmp/cts/content/HelloWorld5_mdpi-v4.apk.idsig" />
<option name="push-file" key="HelloWorld5_xhdpi-v4.apk" value="/data/local/tmp/cts/content/HelloWorld5_xhdpi-v4.apk" />
+ <option name="push-file" key="HelloWorld5_xhdpi-v4.apk.idsig" value="/data/local/tmp/cts/content/HelloWorld5_xhdpi-v4.apk.idisg" />
<option name="push-file" key="HelloWorld5_xxhdpi-v4.apk" value="/data/local/tmp/cts/content/HelloWorld5_xxhdpi-v4.apk" />
+ <option name="push-file" key="HelloWorld5_xxhdpi-v4.apk.idsig" value="/data/local/tmp/cts/content/HelloWorld5_xxhdpi-v4.apk.idsig" />
<option name="push-file" key="HelloWorld5_xxxhdpi-v4.apk" value="/data/local/tmp/cts/content/HelloWorld5_xxxhdpi-v4.apk" />
+ <option name="push-file" key="HelloWorld5_xxxhdpi-v4.apk.idsig" value="/data/local/tmp/cts/content/HelloWorld5_xxxhdpi-v4.apk.idsig" />
<option name="push-file" key="HelloWorld7.apk" value="/data/local/tmp/cts/content/HelloWorld7.apk" />
+ <option name="push-file" key="HelloWorld7.apk.idsig" value="/data/local/tmp/cts/content/HelloWorld7.apk.idsig" />
<option name="push-file" key="HelloWorld7_hdpi-v4.apk" value="/data/local/tmp/cts/content/HelloWorld7_hdpi-v4.apk" />
+ <option name="push-file" key="HelloWorld7_hdpi-v4.apk.idsig" value="/data/local/tmp/cts/content/HelloWorld7_hdpi-v4.apk.idsig" />
<option name="push-file" key="HelloWorld7_mdpi-v4.apk" value="/data/local/tmp/cts/content/HelloWorld7_mdpi-v4.apk" />
+ <option name="push-file" key="HelloWorld7_mdpi-v4.apk.idsig" value="/data/local/tmp/cts/content/HelloWorld7_mdpi-v4.apk.idsig" />
<option name="push-file" key="HelloWorld7_xhdpi-v4.apk" value="/data/local/tmp/cts/content/HelloWorld7_xhdpi-v4.apk" />
+ <option name="push-file" key="HelloWorld7_xhdpi-v4.apk.idsig" value="/data/local/tmp/cts/content/HelloWorld7_xhdpi-v4.apk.idsig" />
<option name="push-file" key="HelloWorld7_xxhdpi-v4.apk" value="/data/local/tmp/cts/content/HelloWorld7_xxhdpi-v4.apk" />
+ <option name="push-file" key="HelloWorld7_xxhdpi-v4.apk.idsig" value="/data/local/tmp/cts/content/HelloWorld7_xxhdpi-v4.apk.idsig" />
<option name="push-file" key="HelloWorld7_xxxhdpi-v4.apk" value="/data/local/tmp/cts/content/HelloWorld7_xxxhdpi-v4.apk" />
- </target_preparer>
-
- <!-- Incremental installation test files -->
- <target_preparer class="com.android.compatibility.common.tradefed.targetprep.FilePusher">
- <option name="cleanup" value="true" />
- <option name="push" value="HelloWorld5.apk.idsig->/data/local/tmp/cts/content/HelloWorld5.apk.idsig" />
- <option name="push" value="HelloWorld5_hdpi-v4.apk.idsig->/data/local/tmp/cts/content/HelloWorld5_hdpi-v4.apk.idsig" />
- <option name="push" value="HelloWorld5_mdpi-v4.apk.idsig->/data/local/tmp/cts/content/HelloWorld5_mdpi-v4.apk.idsig" />
- <option name="push" value="HelloWorld5_xhdpi-v4.apk.idsig->/data/local/tmp/cts/content/HelloWorld5_xhdpi-v4.apk.idsig" />
- <option name="push" value="HelloWorld5_xxhdpi-v4.apk.idsig->/data/local/tmp/cts/content/HelloWorld5_xxhdpi-v4.apk.idsig" />
- <option name="push" value="HelloWorld5_xxxhdpi-v4.apk.idsig->/data/local/tmp/cts/content/HelloWorld5_xxxhdpi-v4.apk.idsig" />
- <option name="push" value="HelloWorld7.apk.idsig->/data/local/tmp/cts/content/HelloWorld7.apk.idsig" />
- <option name="push" value="HelloWorld7_hdpi-v4.apk.idsig->/data/local/tmp/cts/content/HelloWorld7_hdpi-v4.apk.idsig" />
- <option name="push" value="HelloWorld7_mdpi-v4.apk.idsig->/data/local/tmp/cts/content/HelloWorld7_mdpi-v4.apk.idsig" />
- <option name="push" value="HelloWorld7_xhdpi-v4.apk.idsig->/data/local/tmp/cts/content/HelloWorld7_xhdpi-v4.apk.idsig" />
- <option name="push" value="HelloWorld7_xxhdpi-v4.apk.idsig->/data/local/tmp/cts/content/HelloWorld7_xxhdpi-v4.apk.idsig" />
- <option name="push" value="HelloWorld7_xxxhdpi-v4.apk.idsig->/data/local/tmp/cts/content/HelloWorld7_xxxhdpi-v4.apk.idsig" />
+ <option name="push-file" key="HelloWorld7_xxxhdpi-v4.apk.idsig" value="/data/local/tmp/cts/content/HelloWorld7_xxxhdpi-v4.apk.idsig" />
</target_preparer>
<target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
