diff --git a/git_cl.py b/git_cl.py index 6a59cda52..1e2261c13 100755 --- a/git_cl.py +++ b/git_cl.py @@ -1799,7 +1799,7 @@ class _RietveldChangelistImpl(_ChangelistCodereviewBase): DieWithError('Cannot set-commit on private issue') if new_state == _CQState.COMMIT: - self.SetFlag('commit', '1') + self.SetFlags({'commit': '1', 'cq_dry_run': '0'}) elif new_state == _CQState.NONE: self.SetFlags({'commit': '0', 'cq_dry_run': '0'}) else: diff --git a/tests/git_cl_test.py b/tests/git_cl_test.py index a4a7a5806..286290fa6 100755 --- a/tests/git_cl_test.py +++ b/tests/git_cl_test.py @@ -1466,8 +1466,8 @@ class TestGitCl(TestCase): self.assertIsNone(cl.EnsureAuthenticated(force=False)) def test_cmd_set_commit_rietveld(self): - self.mock(git_cl._RietveldChangelistImpl, 'SetFlag', - lambda _, f, v: self._mocked_call(['SetFlag', f, v])) + self.mock(git_cl._RietveldChangelistImpl, 'SetFlags', + lambda _, v: self._mocked_call(['SetFlags', v])) self.calls = [ ((['git', 'symbolic-ref', 'HEAD'],), 'feature'), ((['git', 'config', 'branch.feature.rietveldissue'],), '123'), @@ -1476,7 +1476,7 @@ class TestGitCl(TestCase): ((['git', 'config', 'rietveld.server'],), ''), ((['git', 'config', 'branch.feature.rietveldserver'],), 'https://codereview.chromium.org'), - ((['SetFlag', 'commit', '1'], ), ''), + ((['SetFlags', {'commit': '1', 'cq_dry_run': '0'}], ), ''), ] self.assertEqual(0, git_cl.main(['set-commit']))