[Password manager tests automation] Adds an ability to specify test_case which should be run.

components/test/data/password_manager/automated_tests/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.
 
 """Automated tests for many websites"""
 
 import argparse
 
 from environment import Environment
@@ skipping 491 matching lines @@
     for (name, test_type, success, failure_log) in environment_tests_results:
       if not (save_only_failures and success):
         xml += (
             "<test name='{0}' successful='{1}' type='{2}'>{3}</test>".format(
                 name, success, test_type, failure_log))
     xml += "</result>"
     with open(environment_save_path, "w") as save_file:
       save_file.write(xml)
 
 def RunTest(chrome_path, chromedriver_path, profile_path,
-            environment_passwords_path, website_test_name, test_type):
+            environment_passwords_path, website_test_name, test_case_name):
   """Runs the test for the specified website.
 
   Args:
     chrome_path: The chrome binary file.
     chromedriver_path: The chromedriver binary file.
     profile_path: The chrome testing profile folder.
     environment_passwords_path: The usernames and passwords file.
     website_test_name: Name of the website to test (refer to keys in
         all_tests above).
 
   Returns:
     The results of the test as list of TestResults.
 
   Raises:
     Exception: An exception is raised if one of the tests for the website
         fails, or if the website name is not known.
   """
 
-  enable_automatic_password_saving = (
-      test_type == WebsiteTest.TEST_TYPE_SAVE_AND_AUTOFILL)
+  enable_automatic_password_saving = (test_case_name == "SaveAndAutofillTest")
   environment = Environment(chrome_path, chromedriver_path, profile_path,
                             environment_passwords_path,
                             enable_automatic_password_saving)
 
   if website_test_name in all_tests:
     environment.AddWebsiteTest(all_tests[website_test_name])
   else:
     raise Exception("Test name {} is unknown.".format(website_test_name))
 
-  environment.RunTestsOnSites(test_type)
+  environment.RunTestsOnSites(test_case_name)
   environment.Quit()
   return environment.tests_results
 
 def main():
   parser = argparse.ArgumentParser(
       description="Password Manager automated tests help.")
 
   parser.add_argument(
       "--chrome-path", action="store", dest="chrome_path",
       help="Set the chrome path (required).", required=True)
   parser.add_argument(
       "--chromedriver-path", action="store", dest="chromedriver_path",
       help="Set the chromedriver path (required).", 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)
 
   parser.add_argument(
       "--passwords-path", action="store", dest="passwords_path",
       help="Set the usernames/passwords path (required).", required=True)
   parser.add_argument("--save-path", action="store", dest="save_path",
                       help="Write the results in a file.")
-  parser.add_argument("test", help="Test to be run.")
   parser.add_argument("--save-only-failures",
                       help="Only save logs for failing tests.",
                       dest="save_only_failures", action="store_true",
-                      default=False)
-
+  parser.add_argument("website", help="Website test name on which"
+                      "tests should be run.")
+  # TODO(melandory): Think about supporting test case specifying on website

[vabr (Chromium), 2015/04/13 15:26:20]

I'm not sure I understand what you want to think about. Could you please
explain?

[melandory, 2015/04/14 07:22:36]

Hm, actually this todo doesn't belong here. And probably not needed at all.
Sorry for noise.

+  # basis.
+  parser.add_argument("--test-cases-to-run", help="Names of test cases which"
+                      "should be run. Currently supported test cases are:"
+                      "PromptFailTest, PromptSuccessTest, SaveAndAutofillTest",
+                      dest="test_cases_to_run", action="store", nargs="*")
   args = parser.parse_args()
 
   save_path = None
   if args.save_path:
     save_path = args.save_path
 
-  tests_results = RunTest(
-      args.chrome_path, args.chromedriver_path, args.profile_path,
-      args.passwords_path, args.test, WebsiteTest.TEST_TYPE_PROMPT_FAIL)
+  test_cases_to_run = args.test_cases_to_run or\
+      ("PromptFailTest", "PromptSuccessTest", "SaveAndAutofillTest")
 
-  tests_results += RunTest(
-      args.chrome_path, args.chromedriver_path, args.profile_path,
-      args.passwords_path, args.test, WebsiteTest.TEST_TYPE_PROMPT_SUCCESS)
+  for test_case in test_cases_to_run:
+    tests_results = RunTest(
+        args.chrome_path, args.chromedriver_path, args.profile_path,
+        args.passwords_path, args.website, test_case)
 
-  tests_results += RunTest(
-      args.chrome_path, args.chromedriver_path, args.profile_path,
-      args.passwords_path, args.test, WebsiteTest.TEST_TYPE_SAVE_AND_AUTOFILL)
 
   SaveResults(tests_results, save_path,
               save_only_failures=args.save_only_failures)
 
 if __name__ == "__main__":
   main()