[pyauto] Add ability to specify @SUITE_NAME on command line

chrome/test/pyautolib/pyauto.py

 #!/usr/bin/env python
 # 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.
 
 """PyAuto: Python Interface to Chromium's Automation Proxy.
 
 PyAuto uses swig to expose Automation Proxy interfaces to Python.
 For complete documentation on the functionality available,
 run pydoc on this file.
@@ skipping 6166 matching lines @@
         '', '--chrome-flags', type='string', default='',
         help='Flags passed to Chrome.  This is in addition to the usual flags '
              'like suppressing first-run dialogs, enabling automation.  '
              'See chrome/common/chrome_switches.cc for the list of flags '
              'chrome understands.')
     parser.add_option(
         '', '--http-data-dir', type='string',
         default=os.path.join('chrome', 'test', 'data'),
         help='Relative path from which http server should serve files.')
     parser.add_option(
-        '', '--list-missing-tests', action='store_true', default=False,
-        help='Print a list of tests not included in PYAUTO_TESTS, and exit')
-    parser.add_option(
         '-L', '--list-tests', action='store_true', default=False,
         help='List all tests, and exit.')
     parser.add_option(
         '--shard',
         help='Specify sharding params. Example: 1/3 implies split the list of '
              'tests into 3 groups of which this is the 1st.')
     parser.add_option(
         '', '--log-file', type='string', default=None,
         help='Provide a path to a file to which the logger will log')
     parser.add_option(
@@ skipping 25 matching lines @@
     # Set up logging. All log messages will be prepended with a timestamp.
     format = '%(asctime)s %(levelname)-8s %(message)s'
 
     level = logging.INFO
     if self._options.verbose:
       level=logging.DEBUG
 
     logging.basicConfig(level=level, format=format,
                         filename=self._options.log_file)
 
-    if self._options.list_missing_tests:
-      self._ListMissingTests()
-      sys.exit(0)
-
   def TestsDir(self):
     """Returns the path to dir containing tests.
 
     This is typically the dir containing the tests description file.
     This method should be overridden by derived class to point to other dirs
     if needed.
     """
     return os.path.dirname(__file__)
 
   @staticmethod
@@ skipping 46 matching lines @@
       return _GetTestsFromModule(obj)
     elif (isinstance(obj, (type, types.ClassType)) and
           issubclass(obj, PyUITest) and obj != PyUITest):
       return [module.__name__ + '.' + x for x in _GetTestsFromTestCase(obj)]
     elif type(obj) == types.UnboundMethodType:
       return [name]
     else:
       logging.warn('No tests in "%s"', name)
       return []
 
-  def _ListMissingTests(self):
-    """Print tests missing from PYAUTO_TESTS."""
-    # Fetch tests from all test scripts
-    all_test_files = filter(lambda x: x.endswith('.py'),
-                            os.listdir(self.TestsDir()))
-    all_tests_modules = [os.path.splitext(x)[0] for x in all_test_files]
-    all_tests = reduce(lambda x, y: x + y,
-                       map(self._ImportTestsFromName, all_tests_modules))
-    # Fetch tests included by PYAUTO_TESTS
-    pyauto_tests_file = os.path.join(self.TestsDir(), self._tests_filename)
-    pyauto_tests = reduce(lambda x, y: x + y,
-                          map(self._ImportTestsFromName,
-                              self._ExpandTestNamesFrom(pyauto_tests_file,
-                                                        self._options.suite)))
-    for a_test in all_tests:
-      if a_test not in pyauto_tests:
-        print a_test
-
   def _HasTestCases(self, module_string):
     """Determines if we have any PyUITest test case classes in the module
        identified by |module_string|."""
     module = __import__(module_string)
     for name in dir(module):
       obj = getattr(module, name)
       if (isinstance(obj, (type, types.ClassType)) and
           issubclass(obj, PyUITest)):
         return True
     return False
 
   def _ExpandTestNames(self, args):
     """Returns a list of tests loaded from the given args.
 
     The given args can be either a module (ex: module1) or a testcase
     (ex: module2.MyTestCase) or a test (ex: module1.MyTestCase.testX)
-    If empty, the tests in the already imported modules are loaded.
+    or a suite name (ex: @FULL). If empty, the tests in the already imported
+    modules are loaded.
 
     Args:
       args: [module1, module2, module3.testcase, module4.testcase.testX]
-            These modules or test cases or tests should be importable
+            These modules or test cases or tests should be importable.
+            Suites can be specified by prefixing @. Example: @FULL
 
       Returns:
         a list of expanded test names.  Example:
           [
             'module1.TestCase1.testA',
             'module1.TestCase1.testB',
             'module2.TestCase2.testX',
             'module3.testcase.testY',
             'module4.testcase.testX'
           ]
     """
+
+    def _TestsFromDescriptionFile(suite=None):
+      pyauto_tests_file = os.path.join(self.TestsDir(), self._tests_filename)
+      if suite:
+        logging.debug("Reading %s (@%s)", pyauto_tests_file, suite)
+      else:
+        logging.debug("Reading %s", pyauto_tests_file)
+      if not os.path.exists(pyauto_tests_file):
+        logging.warn("%s missing. Cannot load tests.", pyauto_tests_file)
+        return []
+      else:
+        return self._ExpandTestNamesFrom(pyauto_tests_file, suite)
+
     if not args:  # Load tests ourselves
       if self._HasTestCases('__main__'):    # we are running a test script
         module_name = os.path.splitext(os.path.basename(sys.argv[0]))[0]
         args.append(module_name)   # run the test cases found in it
       else:  # run tests from the test description file
-        pyauto_tests_file = os.path.join(self.TestsDir(), self._tests_filename)
-        logging.debug("Reading %s", pyauto_tests_file)
-        if not os.path.exists(pyauto_tests_file):
-          logging.warn("%s missing. Cannot load tests.", pyauto_tests_file)
+        args = _TestsFromDescriptionFile(self._options.suite)

[dennis_jeffrey, 2012/08/01 01:23:27]

suite=self._options.suite (or else remove default value for the parameter in the
function at line 6333 above)

+    else:  # Check args with @ prefix for suites
+      out_args = []
+      for arg in args:
+        if arg.startswith('@'):
+          suite = arg[1:]
+          out_args += _TestsFromDescriptionFile(suite)

[dennis_jeffrey, 2012/08/01 01:23:27]

similar comment as line 6350 above

         else:
-          args = self._ExpandTestNamesFrom(pyauto_tests_file,
-                                           self._options.suite)
+          out_args.append(arg)
+      args = out_args
     return args
 
   def _ExpandTestNamesFrom(self, filename, suite):
     """Load test names from the given file.
 
     Args:
       filename: the file to read the tests from
       suite: the name of the suite to load from |filename|.
 
     Returns:
@@ skipping 81 matching lines @@
     successful = result.wasSuccessful()
     if not successful:
       pyauto_tests_file = os.path.join(self.TestsDir(), self._tests_filename)
       print >>sys.stderr, 'Tests can be disabled by editing %s. ' \
                           'Ref: %s' % (pyauto_tests_file, _PYAUTO_DOC_URL)
     sys.exit(not successful)
 
 
 if __name__ == '__main__':
   Main()