Commit f0587fdd authored by Mathieu Binette's avatar Mathieu Binette Committed by Commit Bot

Update CELab python test framework package.

I updated the chromium bot configs to exclude Chrome-only tests in
https://crrev.com/c/1838375, but the new category filter flags are not
available in the CELab package we use in chromium/src, so this broke
our bots. Oops.

Updating the package will fix this.

Notable changes since the last version:
- Implement @category & filter arguments for EnterpriseTestCase:
  https://crrev.com/c/1823607

Bug: 1013507
Change-Id: I0aeee6021d25b2a3dd0f514f35821dd66069c4e2
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1856398Reviewed-by: default avatarOwen Min <zmin@chromium.org>
Commit-Queue: Mathieu Binette <mbinette@google.com>
Cr-Commit-Position: refs/heads/master@{#705207}
parent a6ae90de
...@@ -11,8 +11,8 @@ python_version: "2.7" ...@@ -11,8 +11,8 @@ python_version: "2.7"
wheel: < wheel: <
name: "infra/celab/celab/windows-amd64" name: "infra/celab/celab/windows-amd64"
# Source: https://ci.chromium.org/p/celab/builders/ci/Windows/b8902045658105865392 # Source: https://ci.chromium.org/p/celab/builders/ci/Windows/b8900225462594660384
version: "mHamQ8UpCgqQTQZyuKIFVlvYy3KSkDCsUSGXQtL5E-YC" version: "Q1ebL0sPA1vX4tcIGj6d0IXxXa02M5CsBm3p0SbeGZUC"
> >
# googleapiclient # googleapiclient
......
...@@ -30,6 +30,16 @@ def ParseArgs(): ...@@ -30,6 +30,16 @@ def ParseArgs():
metavar='<test_class;...>', metavar='<test_class;...>',
default='*', default='*',
help='Fully qualified names of TestCases to run (supports my.package.*)') help='Fully qualified names of TestCases to run (supports my.package.*)')
parser.add_argument(
'--include',
metavar='<categoryA;...>',
default=None,
help='Categories of tests to include')
parser.add_argument(
'--exclude',
metavar='<categoryA;...>',
default=None,
help='Categories of tests to exclude')
parser.add_argument( parser.add_argument(
'--noprogress', '--noprogress',
dest='show_progress', dest='show_progress',
...@@ -106,6 +116,10 @@ if __name__ == '__main__': ...@@ -106,6 +116,10 @@ if __name__ == '__main__':
tests = ArgsParser.ParseTestsArg(args.tests) tests = ArgsParser.ParseTestsArg(args.tests)
logging.debug('Found tests: %s', tests) logging.debug('Found tests: %s', tests)
if args.include or args.exclude:
tests = ArgsParser.ProcessTestFilterArg(tests, args.include, args.exclude)
logging.debug('Got filtered tests: %s', tests)
hostFiles = ArgsParser.ParseHostsArg(args.hosts) hostFiles = ArgsParser.ParseHostsArg(args.hosts)
logging.debug('Found hosts: %s', hostFiles) logging.debug('Found hosts: %s', hostFiles)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment