From 850fcb24aba95c1dfd99b6b8d536134f8907cea6 Mon Sep 17 00:00:00 2001 From: Sergei Trofimov Date: Thu, 1 Dec 2016 15:00:30 +0000 Subject: [PATCH] pylint/pep8 fixes --- wlauto/resource_getters/standard.py | 2 +- wlauto/workloads/geekbench/__init__.py | 4 +++- wlauto/workloads/octaned8/__init__.py | 2 ++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/wlauto/resource_getters/standard.py b/wlauto/resource_getters/standard.py index cd386364..eb0c7101 100644 --- a/wlauto/resource_getters/standard.py +++ b/wlauto/resource_getters/standard.py @@ -414,7 +414,7 @@ class HttpGetter(ResourceGetter): return requests.get(url, auth=auth, stream=stream) def resolve_resource(self, resource): - # pylint: disable=too-many-branches + # pylint: disable=too-many-branches,too-many-locals assets = self.index.get(resource.owner.name, {}) if not assets: return {} diff --git a/wlauto/workloads/geekbench/__init__.py b/wlauto/workloads/geekbench/__init__.py index 7f8cc182..f3abfde8 100644 --- a/wlauto/workloads/geekbench/__init__.py +++ b/wlauto/workloads/geekbench/__init__.py @@ -165,7 +165,8 @@ class Geekbench(AndroidUiAutoBenchmark): for workloads in section['workloads']: workload_name = workloads['name'].replace(" ", "-") context.result.add_metric(namemify(section['name'] + '_' + workload_name + '_score', i), - workloads['score']) + workloads['score']) + class GBWorkload(object): """ @@ -377,5 +378,6 @@ class GBScoreCalculator(object): def namemify(basename, i): return basename + (' {}'.format(i) if i else '') + def versiontuple(v): return tuple(map(int, (v.split(".")))) diff --git a/wlauto/workloads/octaned8/__init__.py b/wlauto/workloads/octaned8/__init__.py index 568751dd..6879269c 100644 --- a/wlauto/workloads/octaned8/__init__.py +++ b/wlauto/workloads/octaned8/__init__.py @@ -22,6 +22,7 @@ from wlauto import Workload, Parameter, Executable from wlauto.common.resources import File from wlauto.exceptions import ConfigError + regex_map = { "Richards": (re.compile(r'Richards: (\d+.*)')), "DeltaBlue": (re.compile(r'DeltaBlue: (\d+.*)')), @@ -42,6 +43,7 @@ regex_map = { "Score": (re.compile(r'Score .*: (\d+.*)')) } + class Octaned8(Workload): name = 'octaned8'