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

Added the ability to override the timeout of deploying the assets tarball in GameWorkload

Browse Source
This commit is contained in:
Sergei Trofimov 2015-07-16 16:53:35 +01:00
parent 2d3be33bb0
commit d2dbc9d6dd
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -142,13 +142,13 @@ class ApkWorkload(Workload):
package = None package = None
activity = None activity = None
view = None view = None
install_timeout = None
default_install_timeout = 300
supported_platforms = ['android'] supported_platforms = ['android']
parameters = [ parameters = [
Parameter('install_timeout', kind=int, default=300,
description='Timeout for the installation of the apk.'),
Parameter('uninstall_apk', kind=boolean, default=False, Parameter('uninstall_apk', kind=boolean, default=False,
description="If ``True``, will uninstall workload's APK as part of teardown."), description='If ``True``, will uninstall workload\'s APK as part of teardown.'),
] ]
def __init__(self, device, _call_super=True, **kwargs): def __init__(self, device, _call_super=True, **kwargs):
@ -158,8 +158,6 @@ class ApkWorkload(Workload):
self.apk_version = None self.apk_version = None
self.logcat_log = None self.logcat_log = None
self.force_reinstall = kwargs.get('force_reinstall', False) self.force_reinstall = kwargs.get('force_reinstall', False)
if not self.install_timeout:
self.install_timeout = self.default_install_timeout
def init_resources(self, context): def init_resources(self, context):
self.apk_file = context.resolver.get(wlauto.common.android.resources.ApkFile(self), version=getattr(self, 'version', None)) self.apk_file = context.resolver.get(wlauto.common.android.resources.ApkFile(self), version=getattr(self, 'version', None))
@ -358,11 +356,13 @@ class GameWorkload(ApkWorkload, ReventWorkload):
asset_file = None asset_file = None
saved_state_file = None saved_state_file = None
view = 'SurfaceView' view = 'SurfaceView'
install_timeout = 500
loading_time = 10 loading_time = 10
supported_platforms = ['android'] supported_platforms = ['android']
parameters = [ parameters = [
Parameter('install_timeout', default=500, override=True),
Parameter('assets_push_timeout', kind=int, default=500,
description='Timeout used during deployment of the assets package (if there is one).'),
Parameter('clear_data_on_reset', kind=bool, default=True, Parameter('clear_data_on_reset', kind=bool, default=True,
description=""" description="""
If set to ``False``, this will prevent WA from clearing package If set to ``False``, this will prevent WA from clearing package
@ -389,7 +389,7 @@ class GameWorkload(ApkWorkload, ReventWorkload):
def do_post_install(self, context): def do_post_install(self, context):
ApkWorkload.do_post_install(self, context) ApkWorkload.do_post_install(self, context)
self._deploy_assets(context) self._deploy_assets(context, self.assets_push_timeout)
def reset(self, context): def reset(self, context):
# If saved state exists, restore it; if not, do full # If saved state exists, restore it; if not, do full
@ -430,7 +430,7 @@ class GameWorkload(ApkWorkload, ReventWorkload):
raise WorkloadError(message.format(resource_file, self.name)) raise WorkloadError(message.format(resource_file, self.name))
# adb push will create intermediate directories if they don't # adb push will create intermediate directories if they don't
# exist. # exist.
self.device.push_file(asset_tarball, ondevice_cache) self.device.push_file(asset_tarball, ondevice_cache, timeout=timeout)
device_asset_directory = self.device.path.join(self.device.external_storage_directory, 'Android', kind) device_asset_directory = self.device.path.join(self.device.external_storage_directory, 'Android', kind)
deploy_command = 'cd {} && {} tar -xzf {}'.format(device_asset_directory, deploy_command = 'cd {} && {} tar -xzf {}'.format(device_asset_directory,