git cl set-commit: fix for Rietveld if cq dry run is active.

tests/git_cl_test.py

 #!/usr/bin/env python
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Unit tests for git_cl.py."""
 
 import os
 import StringIO
 import stat
@@ skipping 1448 matching lines @@
       'chromium-review.googlesource.com': 'same',
     })
     self.assertIsNone(cl.EnsureAuthenticated(force=False))
 
   def test_gerrit_ensure_authenticated_skipped(self):
     cl = self._test_gerrit_ensure_authenticated_common(
         auth={}, skip_auth_check=True)
     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'),
         ((['git', 'config', 'rietveld.autoupdate'],), ''),
         ((['git', 'config', 'rietveld.server'],), ''),
         ((['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']))
 
   def _cmd_set_commit_gerrit_common(self, vote):
     self.mock(git_cl.gerrit_util, 'SetReview',
               lambda h, i, labels: self._mocked_call(
                   ['SetReview', h, i, labels]))
     self.calls = [
         ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
         ((['git', 'config', 'branch.feature.rietveldissue'],), ''),
@@ skipping 258 matching lines @@
         ((['rm_file_or_tree', '/abs/git_repo_root/.git/hooks/commit-msg'],),
          ''),
     ]
     cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
 
 
 if __name__ == '__main__':
   git_cl.logging.basicConfig(
       level=git_cl.logging.DEBUG if '-v' in sys.argv else git_cl.logging.ERROR)
   unittest.main()