New expect_tests UI

expect_tests/main.py

 # 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.
 
 import argparse
 import logging
 import multiprocessing
 import os
 import sys
 
@@ skipping 46 matching lines @@
       sp.add_argument(
           '--force-coverage', '--force_coverage', action='store_true',
           help='Enable coverage report even when specifying a test filter.')
 
     sp.add_argument(
         '--test-list', '--test_list', metavar='FILE',
         help='take the list of test globs from the FILE (use "-" for stdin)'
     ).completer = lambda **_: []
 
     sp.add_argument(
-      '--package', metavar='PATH', action='append', default=[],
-      help='path to a Python package.')
-
-    sp.add_argument(
-      '--directory', metavar='PATH', action='append', default=[],
-      help='directory containing Python packages to test.')
-
-    sp.add_argument(
         '--html-report', '--html_report', metavar='DIR',
         help='directory to write html report (default: disabled)'
     ).completer = lambda **_: []
 
     sp.add_argument(
         'test_glob', nargs='*', help=(
-            'glob to filter the tests acted on. If the glob begins with "-" '
-            'then it acts as a negation glob and anything which matches it '
-            'will be skipped. If a glob doesn\'t have "*" in it, "*" will be '
-            'implicitly appended to the end')
+            'paths to look for tests in. It can be a directory containing '
+            'packages, a package, a file inside a package or a test inside a '
+            'file (append the name of the test to the path using a colon)')
     )
 
   opts = parser.parse_args(args)
 
   if not hasattr(opts, 'jobs'):
     opts.jobs = 0
   elif opts.jobs < 1:
     parser.error('--jobs was less than 1')
 
   if opts.test_list:
@@ skipping 61 matching lines @@
     cover_ctx.cleanup()
     if (not killed and
         (not opts.test_glob or
         opts.coverage)):
       if not cover_ctx.report(opts.verbose):
         sys.exit(2)
 
     sys.exit(error or killed)
   except KeyboardInterrupt:
     pass