[Password manager tests automation] Add ability to run single test.

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
 import logging
 
 from environment import Environment
 from websitetest import WebsiteTest
 
 
 class TypeOfTestedWebsites:
   """An enum to specify which groups of tests to run."""
   # Runs only the disabled tests.
   DISABLED_TESTS = 0

[vabr (Chromium), 2015/03/09 14:52:17]

Could you please add a
# TODO(vabr): Remove this option.
?
This looks like an unlikely use-case, and not supporting it will simplify the
class a little.

[melandory, 2015/03/09 15:00:27]

Done.

   # Runs only the enabled tests.
   ENABLED_TESTS = 1
   # Runs all the tests.
   ALL_TESTS = 2
   # Runs a specified list of tests.
   LIST_OF_TESTS = 3
 
   def __init__(self):
     pass
 
@@ skipping 221 matching lines @@
     self.GoTo("https://vube.com")
     self.Click("[vube-login='']")
     self.FillUsernameInto("[ng-model='login.user']")
     self.FillPasswordInto("[ng-model='login.pass']")
     while (self.IsDisplayed("[ng-model='login.pass']")
            and not self.IsDisplayed(".prompt.alert")):
       self.ClickIfClickable("[ng-click='login()']")
       self.Wait(1)
 
 
-def Tests(environment):
+def Tests(environment, tests_to_run=None):
 
-
-  # Working tests.
-
-
-  environment.AddWebsiteTest(Facebook("facebook"))
-
-  environment.AddWebsiteTest(Google("google"))
-
-  environment.AddWebsiteTest(Linkedin("linkedin"))
-
-  environment.AddWebsiteTest(Mailru("mailru"))
-
-  environment.AddWebsiteTest(Nytimes("nytimes"))
-
-  environment.AddWebsiteTest(Pinterest("pinterest"))
-
-  environment.AddWebsiteTest(Reddit("reddit", username_not_auto=True))
-
-  environment.AddWebsiteTest(Tumblr("tumblr", username_not_auto=True))
-
-  environment.AddWebsiteTest(Twitter("twitter"))
-
-  environment.AddWebsiteTest(Wikipedia("wikipedia", username_not_auto=True))
-
-  environment.AddWebsiteTest(Yahoo("yahoo", username_not_auto=True))
-
-  environment.AddWebsiteTest(Yandex("yandex"))
+  # Working tests

[vabr (Chromium), 2015/03/09 14:52:17]

nit: The comment here and on line 278 is no longer needed, thanks to the good
naming of the dictionary you introduced.

+  working_tests = {
+    "facebook": Facebook("facebook"),
+    "google": Google("google"),
+    "linkedin": Linkedin("linkedin"),
+    "mailru": Mailru("mailru"),
+    "nytimes": Nytimes("nytimes"),
+    "pinterest": Pinterest("pinterest"),
+    "reddit": Reddit("reddit", username_not_auto=True),
+    "tumblr": Tumblr("tumblr", username_not_auto=True),
+    "twitter": Twitter("twitter"),
+    "wikipedia": Wikipedia("wikipedia", username_not_auto=True),
+    "yahoo": Yahoo("yahoo", username_not_auto=True),
+    "yandex": Yandex("yandex")
+  }
 
   # Disabled tests.
+  disabled_tests = {
+    "amazon": Amazon("amazon"), # Bug not reproducible without test.
+    "ask": Ask("ask"), # Password not saved.
+    "baidu": Baidu("baidu"), # Password not saved.
+    "cnn": Cnn("cnn"), # http://crbug.com/368690
+    "ebay": Ebay("ebay"), # http://crbug.com/368690
+    "espn": Espn("espn"), # Iframe, password saved but not autofileld.
+    "live": Live("live", username_not_auto=True),  # http://crbug.com/367768
+    "163": One63("163"), # http://crbug.com/368690
+    "vube": Vube("vube"), # http://crbug.com/368690
+  }
 
+  if tests_to_run:
+    for test in tests_to_run:
+      if (test not in working_tests.keys() and
+          test not in disabled_tests.keys()):
+        print "Skip test: test {} is not in known tests".format(test)
+        continue
+      if test in working_tests.keys():
+        test_class = working_tests[test]
+      else:
+        test_class = disabled_tests[test]
+      environment.AddWebsiteTest(test_class)
+  else:
+    for _, test in working_tests:
+      environment.AddWebsiteTest(test)
+    for _, test in disabled_tests:
+      environment.AddWebsiteTest(test, disabled=True)
 
-  # Bug not reproducible without test.
-  environment.AddWebsiteTest(Amazon("amazon"), disabled=True)
-
-  # Password not saved.
-  environment.AddWebsiteTest(Ask("ask"), disabled=True)
-
-  # Password not saved.
-  environment.AddWebsiteTest(Baidu("baidu"), disabled=True)
-
-  # http://crbug.com/368690
-  environment.AddWebsiteTest(Cnn("cnn"), disabled=True)
-
-  # http://crbug.com/368690
-  environment.AddWebsiteTest(Ebay("ebay"), disabled=True)
-
-  # Iframe, password saved but not autofileld.
-  environment.AddWebsiteTest(Espn("espn"), disabled=True)
-
-  # http://crbug.com/367768
-  environment.AddWebsiteTest(Live("live", username_not_auto=True),
-                             disabled=True)
-
-  # http://crbug.com/368690
-  environment.AddWebsiteTest(One63("163"), disabled=True)
-
-  # http://crbug.com/368690
-  environment.AddWebsiteTest(Vube("vube"), disabled=True)
 
 def saveResults(environment_tests_results, environment_save_path):
   """Save the test results in an xml file.
 
   Args:
     environment_tests_results: A list of the TestResults that are going to be
         saved.
     environment_save_path: The file where the results are going to be saved.
         If it's None, the results are not going to be stored.
   Raises:
@@ skipping 42 matching lines @@
                             environment_passwords_path,
                             enable_automatic_password_saving,
                             environment_numeric_level,
                             log_to_console,
                             environment_log_file)
 
   # Test which care about the save-password prompt need the prompt
   # to be shown. Automatic password saving results in no prompt.
   run_prompt_tests = not enable_automatic_password_saving
 
-  Tests(environment)
+  Tests(environment, tests)
 
   if environment_tested_websites == TypeOfTestedWebsites.ALL_TESTS:
     environment.AllTests(run_prompt_tests)
   elif environment_tested_websites == TypeOfTestedWebsites.DISABLED_TESTS:
     environment.DisabledTests(run_prompt_tests)
   elif environment_tested_websites == TypeOfTestedWebsites.LIST_OF_TESTS:
     environment.Test(tests, run_prompt_tests)
   elif environment_tested_websites == TypeOfTestedWebsites.ENABLED_TESTS:
     environment.WorkingTests(run_prompt_tests)
   else:
@@ skipping 87 matching lines @@
                             args.profile_path[0],
                             passwords_path,
                             True,
                             numeric_level,
                             args.log_screen,
                             log_file,
                             tested_websites,
                             args.tests)
 
   saveResults(tests_results, save_path)