Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1739)

Unified Diff: build/android/pylib/instrumentation/test_runner.py

Issue 132463007: Enable presubmit pylint in build/android. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: build/android/pylib/instrumentation/test_runner.py
diff --git a/build/android/pylib/instrumentation/test_runner.py b/build/android/pylib/instrumentation/test_runner.py
index dda8162ba6c12d44af20fc5ec3540bd39994911f..278cc867e5c3c6752360a7bd95ad60b09946c133 100644
--- a/build/android/pylib/instrumentation/test_runner.py
+++ b/build/android/pylib/instrumentation/test_runner.py
@@ -24,7 +24,7 @@ from pylib.base import base_test_result
from pylib.base import base_test_runner
from pylib.instrumentation import json_perf_parser
-import test_result
+from . import test_result
_PERF_TEST_ANNOTATION = 'PerfTest'
@@ -73,9 +73,11 @@ class TestRunner(base_test_runner.BaseTestRunner):
test_options.cleanup_test_files)
self._lighttp_port = constants.LIGHTTPD_RANDOM_PORT_FIRST + shard_index
+ self.coverage_device_file = ''
frankf 2014/02/03 18:58:51 why not None?
jbudorick 2014/02/03 19:33:57 because I'm still getting used to dynamic typing :
+ self.coverage_dir = test_options.coverage_dir
+ self.coverage_host_file = ''
self.options = test_options
self.test_pkg = test_pkg
- self.coverage_dir = test_options.coverage_dir
# Use the correct command line file for the package under test.
cmdline_file = [a.cmdline_file for a in constants.PACKAGE_INFO.itervalues()
if a.test_package == self.test_pkg.GetPackageName()]
@@ -112,7 +114,7 @@ class TestRunner(base_test_runner.BaseTestRunner):
# TODO(frankf): Specify test data in this file as opposed to passing
# as command-line.
for dest_host_pair in self.options.test_data:
- dst_src = dest_host_pair.split(':',1)
+ dst_src = dest_host_pair.split(':', 1)
dst_layer = dst_src[0]
host_src = dst_src[1]
host_test_files_path = '%s/%s' % (constants.DIR_SOURCE_ROOT, host_src)
@@ -152,7 +154,7 @@ class TestRunner(base_test_runner.BaseTestRunner):
# We give different default value to launch HTTP server based on shard index
# because it may have race condition when multiple processes are trying to
# launch lighttpd with same port at same time.
- http_server_ports = self.LaunchTestHttpServer(
+ self.LaunchTestHttpServer(
os.path.join(constants.DIR_SOURCE_ROOT), self._lighttp_port)
if self.flags:
self.flags.AddFlags(['--disable-fre', '--enable-test-intents'])
@@ -332,9 +334,9 @@ class TestRunner(base_test_runner.BaseTestRunner):
raw_result = None
start_date_ms = None
results = base_test_result.TestRunResults()
- timeout=(self._GetIndividualTestTimeoutSecs(test) *
- self._GetIndividualTestTimeoutScale(test) *
- self.tool.GetTimeoutScale())
+ timeout = (self._GetIndividualTestTimeoutSecs(test) *
+ self._GetIndividualTestTimeoutScale(test) *
+ self.tool.GetTimeoutScale())
try:
self.TestSetup(test)
start_date_ms = int(time.time()) * 1000

Powered by Google App Engine
This is Rietveld 408576698