InTheForest/chromium_depot_tools
1
0
Fork 0
mirror of https://chromium.googlesource.com/chromium/tools/depot_tools.git synced 2026-01-11 18:51:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

[gclient] Use lowercase and when merging conditions

Browse Source 
python doesn't understand AND.

R=jojwang@google.com

Change-Id: Icd0a8a4440bea2e272b2e9760bcd88a65d559848
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/5555884
Reviewed-by: Joanna Wang <jojwang@chromium.org>
Auto-Submit: Josip Sokcevic <sokcevic@chromium.org>
Commit-Queue: Joanna Wang <jojwang@chromium.org>
This commit is contained in:
Josip Sokcevic
2024-05-22 18:16:00 +00:00
committed by LUCI CQ
parent 6b4aef5d85
commit 525b18d46b
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gclient_utils.py
View File

@@ -1397,5 +1397,5 @@ def merge_conditions(*conditions):
if not condition: if not condition:
condition = current_condition condition = current_condition
continue continue
condition = f'({condition}) AND ({current_condition})' condition = f'({condition}) and ({current_condition})'
return condition return condition

4
tests/gclient_utils_test.py
View File

@@ -408,10 +408,10 @@ class GClientUtilsTest(trial_dir.TestCase):
self.assertEqual('foo', gclient_utils.merge_conditions(None, 'foo')) self.assertEqual('foo', gclient_utils.merge_conditions(None, 'foo'))
self.assertEqual('(foo) AND (bar)', self.assertEqual('(foo) and (bar)',
gclient_utils.merge_conditions('foo', 'bar')) gclient_utils.merge_conditions('foo', 'bar'))
self.assertEqual('(foo or bar) AND (baz)', self.assertEqual('(foo or bar) and (baz)',
gclient_utils.merge_conditions('foo or bar', 'baz')) gclient_utils.merge_conditions('foo or bar', 'baz'))
if __name__ == '__main__': if __name__ == '__main__':