Add --issue to set-commit and set-close too.

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 44 matching lines @@
     return {
       'reviewers': ['joe@chromium.org', 'john@chromium.org'],
       'messages': [
         {
           'approval': True,
           'sender': 'john@chromium.org',
         },
       ],
     }
 
+  @staticmethod
+  def close_issue(_issue):
+    return 'Closed'
+
 
 class WatchlistsMock(object):
   def __init__(self, _):
     pass
   @staticmethod
   def GetWatchersForPaths(_):
     return ['joe@example.com']
 
 
 class CodereviewSettingsFileMock(object):
@@ skipping 1458 matching lines @@
     self.assertEqual('foobar\n', out.getvalue())
 
   def test_StatusFieldOverrideIssueMissingArgs(self):
     out = StringIO.StringIO()
     self.mock(git_cl.sys, 'stderr', out)
 
     try:
       self.assertEqual(git_cl.main(['status', '--issue', '1']), 0)
     except SystemExit as ex:
       self.assertEqual(ex.code, 2)
-      self.assertRegexpMatches(out.getvalue(), r'--issue may only be specified')
+      self.assertRegexpMatches(out.getvalue(), r'--issue must be specified')
 
     out = StringIO.StringIO()
     self.mock(git_cl.sys, 'stderr', out)
 
     try:
       self.assertEqual(git_cl.main(['status', '--issue', '1', '--rietveld']), 0)
     except SystemExit as ex:
       self.assertEqual(ex.code, 2)
-      self.assertRegexpMatches(out.getvalue(), r'--issue may only be specified')
+      self.assertRegexpMatches(out.getvalue(), r'--field must be specified')
 
   def test_StatusFieldOverrideIssue(self):
     out = StringIO.StringIO()
     self.mock(git_cl.sys, 'stdout', out)
 
     def assertIssue(cl_self, *_args):
       self.assertEquals(cl_self.issue, 1)
       return 'foobar'
 
     self.mock(git_cl.Changelist, 'GetDescription', assertIssue)
     self.calls = [
       ((['git', 'config', 'rietveld.autoupdate'],), ''),
       ((['git', 'config', 'rietveld.server'],), ''),
       ((['git', 'config', 'rietveld.server'],), ''),
     ]
-    git_cl.main(['status', '--issue', '1', '--rietveld', '--field', 'desc'])
+    self.assertEqual(
+      git_cl.main(['status', '--issue', '1', '--rietveld', '--field', 'desc']),
+      0)
     self.assertEqual(out.getvalue(), 'foobar\n')
 
+  def test_SetCloseOverrideIssue(self):
+    def assertIssue(cl_self, *_args):
+      self.assertEquals(cl_self.issue, 1)
+      return 'foobar'
+
+    self.mock(git_cl.Changelist, 'GetDescription', assertIssue)
+    self.mock(git_cl.Changelist, 'CloseIssue', lambda *_: None)
+    self.calls = [
+      ((['git', 'config', 'rietveld.autoupdate'],), ''),
+      ((['git', 'config', 'rietveld.server'],), ''),
+      ((['git', 'config', 'rietveld.server'],), ''),
+    ]
+    self.assertEqual(
+      git_cl.main(['set-close', '--issue', '1', '--rietveld']), 0)
+
+  def test_SetCommitOverrideIssue(self):

[tandrii(chromium), 2016/08/17 21:05:31]

and with this, commit-queue tool in depot_tools can be almost (90%) killed!

[iannucci, 2016/08/17 21:37:08]

:)

+    def assertIssue(cl_self, *_args):
+      self.assertEquals(cl_self.issue, 1)
+      return 'foobar'
+
+    self.mock(git_cl.Changelist, 'GetDescription', assertIssue)
+    self.mock(git_cl.Changelist, 'SetCQState', lambda *_: None)
+    self.calls = [
+      ((['git', 'config', 'rietveld.autoupdate'],), ''),
+      ((['git', 'config', 'rietveld.server'],), ''),
+      ((['git', 'config', 'rietveld.server'],), ''),
+      ((['git', 'symbolic-ref', 'HEAD'],), ''),
+      ((['git', 'config', 'rietveld.server'],), ''),
+      ((['git', 'config', 'rietveld.server'],), ''),
+    ]
+    self.assertEqual(
+      git_cl.main(['set-close', '--issue', '1', '--rietveld']), 0)
+
   def test_description_gerrit(self):
     out = StringIO.StringIO()
     self.mock(git_cl.sys, 'stdout', out)
     self.mock(git_cl.Changelist, 'GetDescription', lambda *args: 'foobar')
 
     self.assertEqual(0, git_cl.main([
         'description', 'https://code.review.org/123123', '-d', '--gerrit']))
     self.assertEqual('foobar\n', out.getvalue())
 
   def test_description_set_raw(self):
@@ skipping 210 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()