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

Commit 160f6c1b authored by Mateusz Cicheński's avatar Mateusz Cicheński
Browse files

Reorder the target preparers to install apps before test. 

Also remove collection of files that won't be present after the test.

Bug: 302034872
Test: csuite-tradefed run commandAndExit csuite-1p3p-pip-flickers --enable-module-dynamic-download --dynamic-download-args pstash:json-credentials-file=/google/data/ro/teams/app-compatibility/test-resources/config/google.com_mobileharness-0e27cf90c7cb.json --package WMShellFlickerTestsPipApps
Change-Id: I7d06c03c94828d4d70eb3dd3f73da5b8f1365d33
parent 5a30cec2

libs/WindowManager/Shell/tests/flicker/pip/csuiteDefaultTemplate.xml

+11 −20
Original line number Diff line number Diff line
@@ -57,6 +57,17 @@ 
        <option name="test-file-name" value="WMShellFlickerTestsPipAppsCSuite.apk"/>

        <option name="test-file-name" value="FlickerTestApp.apk"/>

    </target_preparer>



    <!-- Needed for installing apk's from Play Store -->

    <target_preparer class="com.android.tradefed.targetprep.TestAppInstallSetup">

        <option name="aapt-version" value="AAPT2"/>

        <option name="throw-if-not-found" value="false"/>

        <option name="install-arg" value="-d"/>

        <option name="install-arg" value="-g"/>

        <option name="install-arg" value="-r"/>

        <option name="test-file-name" value="pstash://com.netflix.mediaclient"/>

    </target_preparer>



    <!-- Enable mocking GPS location by the test app -->

    <target_preparer class="com.android.tradefed.targetprep.RunCommandTargetPreparer">

        <option name="run-command"
@@ -93,29 +104,9 @@ 
    <!-- Needed for pulling the collected trace config on to the host -->

    <metrics_collector class="com.android.tradefed.device.metric.FilePullerLogCollector">

        <option name="pull-pattern-keys" value="perfetto_file_path"/>

        <option name="directory-keys"

                value="/data/user/0/com.android.wm.shell.flicker/files"/>

        <option name="directory-keys"

                value="/data/user/0/com.android.wm.shell.flicker.bubbles/files"/>

        <option name="directory-keys"

                value="/data/user/0/com.android.wm.shell.flicker.pip/files"/>

        <option name="directory-keys"

                value="/data/user/0/com.android.wm.shell.flicker.pip.apps/files"/>

        <option name="directory-keys"

                value="/data/user/0/com.android.wm.shell.flicker.splitscreen/files"/>

        <option name="directory-keys"

                value="/data/user/0/com.android.wm.shell.flicker.service/files"/>

        <option name="collect-on-run-ended-only" value="true"/>

        <option name="clean-up" value="true"/>

    </metrics_collector>



    <!-- Needed for installing apk's from Play Store -->

    <target_preparer class="com.android.tradefed.targetprep.TestAppInstallSetup">

        <option name="aapt-version" value="AAPT2"/>

        <option name="throw-if-not-found" value="false"/>

        <option name="install-arg" value="-d"/>

        <option name="install-arg" value="-g"/>

        <option name="install-arg" value="-r"/>

        <option name="test-file-name" value="pstash://com.netflix.mediaclient"/>

    </target_preparer>

</configuration>