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

Workloads: Fixed issues with calling super

Browse Source 
Super works by having a iterator of parent classes to ensure each is called
once and only once. WA calls some parent methods in classes with multiple
inheritenceconditionally so calls them directly instread. This breaks super
which ends up calling some methods multiple times.

To work around this until workloads are reworked to use composition rather than
inheritance, all classes that that subclass `Workload` directly no longer use
`super`.
This commit is contained in:
Sebastian Goscik 2016-09-06 10:11:09 +01:00
parent 3d610788a3
commit 38a7e01e83
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -35,6 +35,10 @@ import wlauto.common.android.resources
DELAY = 5 DELAY = 5
# Due to the way `super` works you have to call it at every level but WA executes some
# methods conditionally and so has to do them directly via the class, this breaks super
# and causes it to run things mutiple times ect. As a work around for this untill workloads
# are reworked everything that subclasses workload calls parent methods explicitly
class UiAutomatorWorkload(Workload): class UiAutomatorWorkload(Workload):
""" """
@ -72,7 +76,7 @@ class UiAutomatorWorkload(Workload):
def __init__(self, device, _call_super=True, **kwargs): # pylint: disable=W0613 def __init__(self, device, _call_super=True, **kwargs): # pylint: disable=W0613
if _call_super: if _call_super:
super(UiAutomatorWorkload, self).__init__(device, **kwargs) Workload.__init__(self, device, **kwargs)
self.uiauto_file = None self.uiauto_file = None
self.device_uiauto_file = None self.device_uiauto_file = None
self.command = None self.command = None
@ -88,7 +92,7 @@ class UiAutomatorWorkload(Workload):
self.uiauto_package = os.path.splitext(os.path.basename(self.uiauto_file))[0] self.uiauto_package = os.path.splitext(os.path.basename(self.uiauto_file))[0]
def setup(self, context): def setup(self, context):
super(UiAutomatorWorkload, self).setup(context) Workload.setup(self, context)
method_string = '{}.{}#{}'.format(self.uiauto_package, self.uiauto_class, self.uiauto_method) method_string = '{}.{}#{}'.format(self.uiauto_package, self.uiauto_class, self.uiauto_method)
params_dict = self.uiauto_params params_dict = self.uiauto_params
params_dict['workdir'] = self.device.working_directory params_dict['workdir'] = self.device.working_directory
@ -181,13 +185,13 @@ class ApkWorkload(Workload):
def __init__(self, device, _call_super=True, **kwargs): def __init__(self, device, _call_super=True, **kwargs):
if _call_super: if _call_super:
super(ApkWorkload, self).__init__(device, **kwargs) Workload.__init__(self, device, **kwargs)
self.apk_file = None self.apk_file = None
self.apk_version = None self.apk_version = None
self.logcat_log = None self.logcat_log = None
def setup(self, context): def setup(self, context):
super(ApkWorkload, self).setup(context) Workload.setup(self, context)
# Get APK for the correct version and device ABI # Get APK for the correct version and device ABI
self.apk_file = context.resolver.get(ApkFile(self, self.device.abi), self.apk_file = context.resolver.get(ApkFile(self, self.device.abi),
version=getattr(self, 'version', None), version=getattr(self, 'version', None),
@ -363,7 +367,7 @@ class ReventWorkload(Workload):
def __init__(self, device, _call_super=True, **kwargs): def __init__(self, device, _call_super=True, **kwargs):
if _call_super: if _call_super:
super(ReventWorkload, self).__init__(device, **kwargs) Workload.__init__(self, device, **kwargs)
devpath = self.device.path devpath = self.device.path
self.on_device_revent_binary = devpath.join(self.device.binaries_directory, 'revent') self.on_device_revent_binary = devpath.join(self.device.binaries_directory, 'revent')
self.setup_timeout = kwargs.get('setup_timeout', None) self.setup_timeout = kwargs.get('setup_timeout', None)
@ -390,7 +394,7 @@ class ReventWorkload(Workload):
self.run_timeout = self.run_timeout or default_run_timeout self.run_timeout = self.run_timeout or default_run_timeout
def setup(self, context): def setup(self, context):
super(ReventWorkload, self).setup(context) Workload.setup(self, context)
self.device.killall('revent') self.device.killall('revent')
command = '{} replay {}'.format(self.on_device_revent_binary, self.on_device_setup_revent) command = '{} replay {}'.format(self.on_device_revent_binary, self.on_device_setup_revent)
self.device.execute(command, timeout=self.setup_timeout) self.device.execute(command, timeout=self.setup_timeout)