Enable presubmit pylint in build/android.

build/android/pylib/instrumentation/test_runner.py

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Class for running instrumentation tests on a single device."""
 
 import logging
 import os
 import re
 import sys
 import time
 
 
 sys.path.append(os.path.join(sys.path[0],
                              os.pardir, os.pardir, 'build', 'util', 'lib',
                              'common'))
 import perf_tests_results_helper
 
 from pylib import android_commands
 from pylib import constants
 from pylib import flag_changer
 from pylib import valgrind_tools
 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'
 
 
 def _GetDataFilesForTestSuite(suite_basename):
   """Returns a list of data files/dirs needed by the test suite.
 
   Args:
     suite_basename: The test suite basename for which to return file paths.
@@ skipping 28 matching lines @@
       device: Attached android device.
       shard_index: Shard index.
       test_pkg: A TestPackage object.
       additional_flags: A list of additional flags to add to the command line.
     """
     super(TestRunner, self).__init__(device, test_options.tool,
                                      test_options.push_deps,
                                      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 :/

(I'll switch to None)

+    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()]
     assert len(cmdline_file) < 2, 'Multiple packages have the same test package'
     if len(cmdline_file) and cmdline_file[0]:
       self.flags = flag_changer.FlagChanger(self.adb, cmdline_file[0])
       if additional_flags:
         self.flags.AddFlags(additional_flags)
     else:
       self.flags = None
@@ skipping 16 matching lines @@
       # Make sure SD card is ready.
       self.adb.WaitForSdCardReady(20)
       for p in test_data:
         self.adb.PushIfNeeded(
             os.path.join(constants.DIR_SOURCE_ROOT, p),
             os.path.join(self.adb.GetExternalStorage(), p))
 
     # 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)
       if os.path.exists(host_test_files_path):
         self.adb.PushIfNeeded(host_test_files_path, '%s/%s/%s' % (
             self.adb.GetExternalStorage(), TestRunner._DEVICE_DATA_DIR,
             dst_layer))
     self.tool.CopyFiles()
     TestRunner._DEVICE_HAS_TEST_FILES[self.device] = True
 
@@ skipping 19 matching lines @@
     if not self.adb.IsRootEnabled():
       logging.warning('Unable to enable java asserts for %s, non rooted device',
                       self.device)
     else:
       if self.adb.SetJavaAssertsEnabled(True):
         self.adb.Reboot(full_reboot=False)
 
     # 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'])
 
   def TearDown(self):
     """Cleans up the test harness and saves outstanding data from test run."""
     if self.flags:
       self.flags.Restore()
     super(TestRunner, self).TearDown()
 
@@ skipping 159 matching lines @@
           self._GetInstrumentationArgs(), timeout)
     except android_commands.errors.WaitForResponseTimedOutError:
       logging.info('Ran the test with timeout of %ds.' % timeout)
       raise
 
   #override
   def RunTest(self, test):
     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
       raw_result = self._RunTest(test, timeout)
       duration_ms = int(time.time()) * 1000 - start_date_ms
       status_code = raw_result.GetStatusCode()
       if status_code:
         if self.options.screenshot_failures:
           self._TakeScreenshot(test)
         log = raw_result.GetFailureReason()
@@ skipping 22 matching lines @@
         duration_ms = 0
       message = str(e)
       if not message:
         message = 'No information.'
       results.AddResult(test_result.InstrumentationTestResult(
           test, base_test_result.ResultType.CRASH, start_date_ms, duration_ms,
           log=message))
       raw_result = None
     self.TestTeardown(test, raw_result)
     return (results, None if results.DidRunPass() else test)