Fix git cl set-commit --clear.

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 1462 matching lines @@
         ((['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'], ), ''),
     ]
     self.assertEqual(0, git_cl.main(['set-commit']))
 
-  def test_cmd_set_commit_gerrit(self):
+  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'],), ''),
         ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
         ((['git', 'config', 'branch.feature.gerritserver'],),
          'https://chromium-review.googlesource.com'),
         ((['SetReview', 'chromium-review.googlesource.com', 123,
-           {'Commit-Queue': 1}],), ''),
+           {'Commit-Queue': vote}],), ''),
     ]
-    # TODO(tandrii): consider testing just set-commit and set-commit --clear,
-    # but without copy-pasting tons of expectations, as modifying them later is
-    # super tedious.
+
+  def test_cmd_set_commit_gerrit_clear(self):
+    self._cmd_set_commit_gerrit_common(0)
+    self.assertEqual(0, git_cl.main(['set-commit', '-c']))
+
+  def test_cmd_set_commit_gerrit_dry(self):
+    self._cmd_set_commit_gerrit_common(1)
     self.assertEqual(0, git_cl.main(['set-commit', '-d']))
 
+  def test_cmd_set_commit_gerrit(self):
+    self._cmd_set_commit_gerrit_common(2)
+    self.assertEqual(0, git_cl.main(['set-commit']))
+
   def test_description_display(self):
     out = StringIO.StringIO()
     self.mock(git_cl.sys, 'stdout', out)
 
     self.mock(git_cl, 'Changelist', ChangelistMock)
     ChangelistMock.desc = 'foo\n'
 
     self.assertEqual(0, git_cl.main(['description', '-d']))
     self.assertEqual('foo\n', out.getvalue())
 
@@ skipping 191 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()