diff options
| -rw-r--r-- | wa/workloads/vellamo/__init__.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/wa/workloads/vellamo/__init__.py b/wa/workloads/vellamo/__init__.py index 29529b43..c8a4b76e 100644 --- a/wa/workloads/vellamo/__init__.py +++ b/wa/workloads/vellamo/__init__.py @@ -48,11 +48,11 @@ class Vellamo(ApkUiautoWorkload): '3.0': ['Browser', 'Metal', 'Multi'], '3.2.4': ['Browser', 'Metal', 'Multi'], } - supported_versions = list(benchmark_types.keys()) + valid_versions = list(benchmark_types.keys()) summary_metrics = None parameters = [ - Parameter('version', kind=str, allowed_values=supported_versions, override=True, + Parameter('version', kind=str, allowed_values=valid_versions, default=sorted(benchmark_types, reverse=True)[0], override=True, description=('Specify the version of Vellamo to be run. ' 'If not specified, the latest available version will be used.')), Parameter('benchmarks', kind=list_of_strs, allowed_values=benchmark_types['3.0'], default=benchmark_types['3.0'], @@ -66,15 +66,15 @@ class Vellamo(ApkUiautoWorkload): ] def setup(self, context): - super(Vellamo, self).setup(context) self.gui.uiauto_params['version'] = self.version self.gui.uiauto_params['browserToUse'] = self.browser self.gui.uiauto_params['metal'] = 'Metal' in self.benchmarks self.gui.uiauto_params['browser'] = 'Browser' in self.benchmarks self.gui.uiauto_params['multicore'] = 'Multi' in self.benchmarks + super(Vellamo, self).setup(context) - def initialize(self, context): - super(Vellamo, self).initialize(context) + def validate(self): + super(Vellamo, self).validate() if self.version == '2.0.3' or not self.benchmarks: # pylint: disable=access-member-before-definition self.benchmarks = self.benchmark_types[self.version] # pylint: disable=attribute-defined-outside-init else: |