sascha/workload-automation
1
0
Fork 0
mirror of https://github.com/ARM-software/workload-automation.git synced 2025-01-31 02:01:16 +00:00
Code Issues Releases Wiki Activity

Merge pull request #486 from setrofim/master

Browse Source 
applaunch: do not attempt to uninstall uiauto apk
This commit is contained in:
setrofim 2017-09-21 17:15:35 +01:00 committed by GitHub
commit 9e498a911e
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
wlauto/common/android/workload.py
View File

@ -72,6 +72,7 @@ class UiAutomatorWorkload(Workload):
# Can be overidden by subclasses to adjust to run time of specific
# benchmarks.
run_timeout = 10 * 60 # seconds
uninstall_uiauto_apk = True
def __init__(self, device, _call_super=True, **kwargs): # pylint: disable=W0613
if _call_super:
@ -118,7 +119,8 @@ class UiAutomatorWorkload(Workload):
pass
def teardown(self, context):
self.device.uninstall(self.uiauto_package)
if self.uninstall_uiauto_apk:
self.device.uninstall(self.uiauto_package)
def validate(self):
if not self.uiauto_file:

4
wlauto/workloads/applaunch/__init__.py
View File

@ -112,6 +112,10 @@ class Applaunch(AndroidUxPerfWorkload):
self.workload_params['markers_enabled'] = True
self.workload = loader.get_workload(self.workload_name, self.device,
**self.workload_params)
# This workload's uiauto apk will not be installed -- automation will be loaded directly form a path
# so do not uninstall during teardown
self.workload.uninstall_uiauto_apk = False
self.init_workload_resources(context)
self.package = self.workload.package