[Password manager tests] Fix indentation bug & use subprocesses to run tests.

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.
 
 """This file allows the bots to be easily configure and run the tests.
 
 Running this script requires passing --config-path with a path to a config file
 of the following structure:
   [credentials]
   pkey=full_path
   client_email=email_assigned_by_google_dev_console
   [drive]
   key=sheet_key_from_sheet_url
   [data_files]
   passwords_path=full_path_to_the_file_with_passwords
 """
 from Sheet import Sheet
 from apiclient.discovery import build
 from datetime import datetime
 from gdata.gauth import OAuth2TokenFromCredentials
 from gdata.spreadsheet.service import SpreadsheetsService
 from oauth2client.client import SignedJwtAssertionCredentials
 import ConfigParser
 import argparse
 import httplib2
 import oauth2client.tools
 import os
+import subprocess
 import tempfile
 
 from environment import Environment
 import tests
 
 _CREDENTIAL_SCOPES = "https://spreadsheets.google.com/feeds"
 
 # TODO(melandory): Function _authenticate belongs to separate module.
 def _authenticate(pkey, client_email):
-""" Authenticates user.
+  """ Authenticates user.
 
-  Args:
-    pkey: Full path to file with private key generated by Google
-      Developer Console.
-    client_email: Email address corresponding to private key and also
-      generated by Google Developer Console.
-"""
+    Args:
+      pkey: Full path to file with private key generated by Google
+        Developer Console.
+      client_email: Email address corresponding to private key and also
+        generated by Google Developer Console.
+  """
   http, token = None, None
   with open(pkey) as pkey_file:
     private_key = pkey_file.read()
     credentials = SignedJwtAssertionCredentials(
         client_email, private_key, _CREDENTIAL_SCOPES)
     http = httplib2.Http()
     http = credentials.authorize(http)
     build('drive', 'v2', http=http)
     token = OAuth2TokenFromCredentials(credentials).access_token
   return http, token
@@ skipping 36 matching lines @@
     except Exception:
       pass
     # TODO(rchtara): Using "timeout is just temporary until a better,
     # platform-independent solution is found.
 
     # The website test runs in two passes, each pass has an internal
     # timeout of 200s for waiting (see |remaining_time_to_wait| and
     # Wait() in websitetest.py). Accounting for some more time spent on
     # the non-waiting execution, 300 seconds should be the upper bound on
     # the runtime of one pass, thus 600 seconds for the whole test.
-    # TODO(vabr): Use subprocess.call.
-    os.system("timeout 600 %s" % test_cmd)
+    subprocess.call(["timeout", "600"] + test_cmd)
     if os.path.isfile(results_path):
       results = open(results_path, "r")
       count = 0 # Count the number of successful tests.
       for line in results:
         # TODO(melandory): We do not need to send all this data to sheet.
         failures.append(line)
         count += line.count("successful='True'")
       results.close()
       # There is only two tests running for every website: the prompt and
       # the normal test. If both of the tests were successful, the tests
@@ skipping 31 matching lines @@
     results = tempfile.NamedTemporaryFile(
         dir=os.path.join(tempfile.gettempdir()), delete=False)
     results_path = results.name
     results.close()
 
     full_path = os.path.realpath(__file__)
     tests_dir = os.path.dirname(full_path)
     tests_path = os.path.join(tests_dir, "tests.py")
 
     for websitetest in environment.websitetests:
-      test_cmd = ("python %s %s --chrome-path %s "
-                  "--chromedriver-path %s"
-                  "--passwords-path %s --profile-path %s "
-                  "--save-path %s" %
-                  (tests_path, websitetest.name, chrome_path,
-                   chromedriver_path,
-                   config.get("data_files", "passwords_path"),
-                   profile_path, results_path))
-      status, log = _try_run_individual_test(
-          websitetest, test_cmd, results_path)
+      test_cmd = ["python", tests_path, websitetest.name,
+                  "--chrome-path", chrome_path,
+                  "--chromedriver-path", chromedriver_path,
+                  "--passwords-path",
+                  config.get("data_files", "passwords_path"),
+                  "--profile-path", profile_path,
+                  "--save-path", results_path]
+      status, log = _try_run_individual_test(test_cmd, results_path)
       try:
         sheet.InsertRow(sheet.row_count,
                         [websitetest.name, status, date, " | ".join(log)])
       except Exception:
         pass # TODO(melandory): Sometimes writing to spreadsheet fails. We need
              # deal with it better that just ignoring.
   finally:
     try:
       os.remove(results_path)
     except Exception:
@@ skipping 14 matching lines @@
       help="File with configuration data: drive credentials, password path",
       required=True)
   parser.add_argument(
       "--profile-path", action="store", dest="profile_path",
       help="Set the profile path (required). You just need to choose a "
            "temporary empty folder. If the folder is not empty all its content "
            "is going to be removed.",
       required=True)
   args = vars(parser.parse_args())
   run_tests(**args)