[Password manager tests automation] Improves redability of code and logs.

components/test/data/password_manager/automated_tests/run_tests.py

 # -*- coding: utf-8 -*-
 # Copyright 2014 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.
 
 """Encapsulates running tests defined in tests.py.
 
 Running this script requires passing --config-path with a path to a config file
 of the following structure:
 
@@ skipping 73 matching lines @@
 
 
 def LogResultsOfTestRun(config, results):
   """ Logs |results| of a test run. """
   logger = logging.getLogger("run_tests")
   failed_tests = []
   failed_tests_num = 0
   for result in results:
     website, test_case, success, reason = result
     if not (config.save_only_fails and success):
-      logger.debug("Test case %s has %s on Website %s", test_case,
-                  website, {True: "passed", False: "failed"}[success])
       if not success:
-        logger.debug("Reason of failure: %s", reason)
+        logger.debug("%s.%s failed with reason: %s",
+                     website, test_case, reason)
 
     if not success:
       failed_tests.append("%s.%s" % (website, test_case))
       failed_tests_num += 1
 
   logger.info("%d failed test cases out of %d, failing test cases: %s",
               failed_tests_num, len(results),
               sorted([name for name in failed_tests]))
 
 
 def RunTestCaseOnWebsite((website, test_case, config)):
   """ Runs a |test_case| on a |website|. In case when |test_case| has
   failed it tries to rerun it. If run takes too long, then it is stopped.
   """
 
   profile_path = tempfile.mkdtemp()
   # The tests can be flaky. This is why we try to rerun up to 3 times.
   attempts = 3
   result = ("", "", False, "")
   logger = logging.getLogger("run_tests")
   for _ in xrange(attempts):
     shutil.rmtree(path=profile_path, ignore_errors=True)
     logger.log(SCRIPT_DEBUG, "Run of test case %s of website %s started",
                test_case, website)
     try:
-      with stopit.ThreadingTimeout(100) as timeout:
+      with stopit.ThreadingTimeout(seconds=100) as timeout:
         logger.log(SCRIPT_DEBUG,
                    "Run test with parameters: %s %s %s %s %s %s",
                    config.chrome_path, config.chromedriver_path,
                    profile_path, config.passwords_path,
                    website, test_case)
         result = tests.RunTest(config.chrome_path, config.chromedriver_path,
                                profile_path, config.passwords_path,
                                website, test_case)[0]
       if timeout.state != timeout.EXECUTED:
         result =  (website, test_case, False,
                    "Got %d as timeout state (see stopit.ThreadingTimeout for"
-                   "the meaning of the number)" % timeout.state)
+                   " the meaning of the number)" % timeout.state)
       _, _, success, _ = result
       if success:
         return result
     except Exception as e:
       result = (website, test_case, False, e)
   return result
 
 
 def RunTests(config_path):
   """Runs automated tests.
@@ skipping 31 matching lines @@
 def main():
   parser = argparse.ArgumentParser()
   parser.add_argument("config_path", metavar="N",
                       help="Path to the config.ini file.")
   args = parser.parse_args()
   RunTests(args.config_path)
 
 
 if __name__ == "__main__":
   main()