diff options
| author | Hakan Lindh <hlindh@google.com> | 2017-12-08 14:12:19 -0800 |
|---|---|---|
| committer | Hakan Lindh <hlindh@google.com> | 2017-12-08 14:12:19 -0800 |
| commit | d2866bf9bccadec1b2bbe76c5b532ceb78930231 (patch) | |
| tree | 758824175fe0f6d9488980ee8918e69b3af0f265 | |
| parent | 73114183835f4d9e6c18010356a32c029a3dca19 (diff) | |
| download | contrib-d2866bf9bccadec1b2bbe76c5b532ceb78930231.tar.gz | |
Adding PushFilePreparer to test config file to support use of --push option
Add PushFilePreparer so we can push files to device
Bug: 70224816
Test:
Change-Id: Iec6c8fe39357073b37cb19bdd6629ba163f6ea37
5 files changed, 6 insertions, 1 deletions
diff --git a/res/config/google/test/framework/media/camera-burst-shot.xml b/res/config/google/test/framework/media/camera-burst-shot.xml index 3abc5b7..bd35349 100644 --- a/res/config/google/test/framework/media/camera-burst-shot.xml +++ b/res/config/google/test/framework/media/camera-burst-shot.xml @@ -2,9 +2,10 @@ <!-- Copyright 2017 Google Inc. All Rights Reserved --> <configuration description="Runs a Camera App startup test on device"> <target_preparer class="com.android.tradefed.targetprep.TestAppInstallSetup" /> + <target_preparer class="com.android.tradefed.targetprep.PushFilePreparer" /> <target_preparer class="com.android.tradefed.targetprep.InstallApkSetup" /> <target_preparer class="com.android.tradefed.targetprep.DeviceCleaner" /> <target_preparer class="com.android.tradefed.targetprep.TimeWaster" /> <target_preparer class="com.android.tradefed.targetprep.TemperatureThrottlingWaiter" /> <test class="com.android.media.tests.CameraBurstStartupTest"/> -</configuration>
\ No newline at end of file +</configuration> diff --git a/res/config/google/test/framework/media/camera-startup.xml b/res/config/google/test/framework/media/camera-startup.xml index 17867a8..608bd59 100644 --- a/res/config/google/test/framework/media/camera-startup.xml +++ b/res/config/google/test/framework/media/camera-startup.xml @@ -2,6 +2,7 @@ <!-- Copyright 2015 Google Inc. All Rights Reserved --> <configuration description="Runs a Camera App startup test on device"> <target_preparer class="com.android.tradefed.targetprep.TestAppInstallSetup" /> + <target_preparer class="com.android.tradefed.targetprep.PushFilePreparer" /> <target_preparer class="com.android.tradefed.targetprep.InstallApkSetup" /> <target_preparer class="com.android.tradefed.targetprep.TimeWaster" /> <target_preparer class="com.android.tradefed.targetprep.TemperatureThrottlingWaiter" /> diff --git a/res/config/google/test/framework/media/camera2-framework-stress.xml b/res/config/google/test/framework/media/camera2-framework-stress.xml index 85931fc..7d6221d 100644 --- a/res/config/google/test/framework/media/camera2-framework-stress.xml +++ b/res/config/google/test/framework/media/camera2-framework-stress.xml @@ -5,6 +5,7 @@ <target_preparer class="com.android.tradefed.targetprep.TestAppInstallSetup"> <option name="test-file-name" value="mediaframeworktest.apk" /> </target_preparer> + <target_preparer class="com.android.tradefed.targetprep.PushFilePreparer" /> <target_preparer class="com.android.tradefed.targetprep.InstallApkSetup" /> <target_preparer class="com.android.tradefed.targetprep.TimeWaster" /> <target_preparer class="com.android.tradefed.targetprep.TemperatureThrottlingWaiter" /> diff --git a/res/config/google/test/framework/media/camera2-latency.xml b/res/config/google/test/framework/media/camera2-latency.xml index 9ed4fe6..1de748c 100644 --- a/res/config/google/test/framework/media/camera2-latency.xml +++ b/res/config/google/test/framework/media/camera2-latency.xml @@ -2,6 +2,7 @@ <!-- Copyright 2015 Google Inc. All Rights Reserved --> <configuration description="Runs a Camera app latency test on device"> <target_preparer class="com.android.tradefed.targetprep.TestAppInstallSetup" /> + <target_preparer class="com.android.tradefed.targetprep.PushFilePreparer" /> <target_preparer class="com.android.tradefed.targetprep.InstallApkSetup" /> <target_preparer class="com.android.tradefed.targetprep.TimeWaster" /> <target_preparer class="com.android.tradefed.targetprep.TemperatureThrottlingWaiter" /> diff --git a/res/config/google/test/framework/media/camera2-stress.xml b/res/config/google/test/framework/media/camera2-stress.xml index 8400eae..0bac157 100644 --- a/res/config/google/test/framework/media/camera2-stress.xml +++ b/res/config/google/test/framework/media/camera2-stress.xml @@ -2,6 +2,7 @@ <!-- Copyright 2015 Google Inc. All Rights Reserved --> <configuration description="Runs a Camera stress test on device"> <target_preparer class="com.android.tradefed.targetprep.TestAppInstallSetup" /> + <target_preparer class="com.android.tradefed.targetprep.PushFilePreparer" /> <target_preparer class="com.android.tradefed.targetprep.InstallApkSetup" /> <target_preparer class="com.android.tradefed.targetprep.TimeWaster" /> <target_preparer class="com.android.tradefed.targetprep.TemperatureThrottlingWaiter" /> |