From 892f2ceea5c9cb143790d79c3fd7ab533c8e1337 Mon Sep 17 00:00:00 2001 From: Joanna Wang Date: Tue, 14 Mar 2023 21:39:47 +0000 Subject: [PATCH] Fix git_cl tests for DOGFOOD_STACKED_CHANGES=1 Bug: 1422684 Change-Id: I0c772951cdce8bbe0b03b0008d26e80adea593d7 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/4337899 Commit-Queue: Gavin Mak Auto-Submit: Joanna Wang Reviewed-by: Gavin Mak --- git_cl.py | 9 +++++++-- tests/git_cl_test.py | 3 +++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/git_cl.py b/git_cl.py index 5cb46e775..7ae990dff 100755 --- a/git_cl.py +++ b/git_cl.py @@ -162,6 +162,11 @@ assert len(_KNOWN_GERRIT_TO_SHORT_URLS) == len( _MAX_STACKED_BRANCHES_UPLOAD = 20 +# Environment variable to indicate if user is participating in the stcked +# changes dogfood. +DOGFOOD_STACKED_CHANGES_VAR = 'DOGFOOD_STACKED_CHANGES' + + # Repo prefixes that are enrolled in the stacked changes dogfood. DOGFOOD_STACKED_CHANGES_REPOS = [ 'chromium.googlesource.com/infra/', @@ -4796,7 +4801,7 @@ def CMDupload(parser, args): options.retry_failed = False remote = cl.GetRemoteUrl() - dogfood_stacked_changes = (os.environ.get('DOGFOOD_STACKED_CHANGES') + dogfood_stacked_changes = (os.environ.get(DOGFOOD_STACKED_CHANGES_VAR) not in ['1', '0'] and any(repo in remote for repo in DOGFOOD_STACKED_CHANGES_REPOS)) @@ -4807,7 +4812,7 @@ def CMDupload(parser, args): 'File bugs at https://bit.ly/3Y6opoI') if options.squash and (dogfood_stacked_changes - or os.environ.get('DOGFOOD_STACKED_CHANGES') == '1'): + or os.environ.get(DOGFOOD_STACKED_CHANGES_VAR) == '1'): if options.dependencies: parser.error('--dependencies is not available for this workflow.') diff --git a/tests/git_cl_test.py b/tests/git_cl_test.py index a2ce1054e..4e6d52cb8 100755 --- a/tests/git_cl_test.py +++ b/tests/git_cl_test.py @@ -4842,6 +4842,9 @@ class CMDUploadTestCase(CMDTestCaseBase): mock.patch( 'git_cl.Settings.GetSquashGerritUploads', return_value=True).start() + mock.patch.dict(os.environ, { + git_cl.DOGFOOD_STACKED_CHANGES_VAR: "0" + }).start() self.addCleanup(mock.patch.stopall) def testWarmUpChangeDetailCache(self):