From 3764fa2517d53d49b59da5aaa3b3c9a5541d34f5 Mon Sep 17 00:00:00 2001 From: "tandrii@chromium.org" Date: Wed, 21 Oct 2015 16:40:40 +0000 Subject: [PATCH] git cl try: default testfilter is no testfilter. This removes default testfilter value ['defaulttests'] from polluting properties everywhere. This also implies that default testfilter is no testfilter or empty list, which should have equivalent meening in try recipes. R=phajdan.jr@chromium.org,nodir@chromium.org BUG=487822 Review URL: https://codereview.chromium.org/1423483002 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@297228 0039d316-1c4b-4281-b951-d872f2087c98 --- git_cl.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/git_cl.py b/git_cl.py index 2f88d0b4a..c212300f5 100755 --- a/git_cl.py +++ b/git_cl.py @@ -245,7 +245,9 @@ def trigger_luci_job(changelist, masters, options): issue = changelist.GetIssue() patchset = changelist.GetMostRecentPatchset() for builders_and_tests in sorted(masters.itervalues()): - for builder in sorted(builders_and_tests.iterkeys()): + # TODO(hinoka et al): add support for other properties. + # Currently, this completely ignores testfilter and other properties. + for builder in sorted(builders_and_tests): luci_trigger.trigger( builder, 'HEAD', issue, patchset, issue_props['project']) @@ -292,9 +294,10 @@ def trigger_try_jobs(auth_config, changelist, options, masters, category): 'patchset': patchset, 'reason': options.name, 'rietveld': rietveld_url, - 'testfilter': tests, }, } + if tests: + parameters['properties']['testfilter'] = tests if properties: parameters['properties'].update(properties) if options.clobber: @@ -3216,7 +3219,7 @@ def CMDtry(parser, args): elif ',' in bot: parser.error('Specify one bot per --bot flag') else: - builders_and_tests.setdefault(bot, []).append('defaulttests') + builders_and_tests.setdefault(bot, []) for bot, tests in new_style: builders_and_tests.setdefault(bot, []).extend(tests)