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

wa/workloads: Update to consistently use timeout parameter

Browse Source
This commit is contained in:
Marc Bonnici 2018-05-14 11:54:44 +01:00 committed by setrofim
parent a23c896647
commit 6754ecd6d7
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
wa/workloads/jankbench/__init__.py
View File

@ -81,7 +81,7 @@ class Jankbench(ApkWorkload):
This defaults to ``True`` for rooted devices and ``False`` otherwise.
'''),
Parameter('run_timeout', kind=int, default=10 * 60,
Parameter('timeout', kind=int, default=10 * 60, aliases=['run_timeout'],
description="""
Time out for workload execution. The workload will be killed if it hasn't completed
within this period.
@ -102,13 +102,13 @@ class Jankbench(ApkWorkload):
self.monitor.start()
def run(self, context):
result = self.target.execute(self.command, timeout=self.run_timeout)
result = self.target.execute(self.command, timeout=self.timeout)
if 'FAILURE' in result:
raise WorkloadError(result)
else:
self.logger.debug(result)
self.target.sleep(DELAY)
self.monitor.wait_for_run_end(self.run_timeout)
self.monitor.wait_for_run_end(self.timeout)
def extract_results(self, context):
self.monitor.stop()

5
wa/workloads/meabo/__init__.py
View File

@ -205,11 +205,12 @@ class Meabo(Workload):
default=2097152,
),
Parameter(
'run_timeout',
'timeout',
kind=int,
description="""
Timeout for execution of the test.
""",
aliases=['run_timeout'],
constraint=lambda x: x > 0,
default=60 * 45,
),
@ -245,7 +246,7 @@ class Meabo(Workload):
def run(self, context):
self.output = self.target.execute(self.command,
timeout=self.run_timeout)
timeout=self.timeout)
def update_output(self, context):
if self.output is None: