Make MockExecutive behave more like MockExecutive2.

third_party/WebKit/Tools/Scripts/webkitpy/tool/commands/auto_rebaseline_unittest.py

 # Copyright 2016 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.
 
 import optparse
 
 from webkitpy.common.net.buildbot import Build
 from webkitpy.common.net.layout_test_results import LayoutTestResults
 from webkitpy.common.system.executive_mock import MockExecutive
 from webkitpy.layout_tests.builder_list import BuilderList
@@ skipping 227 matching lines @@
             [
                 ['python', 'echo', 'optimize-baselines',
                  '--suffixes', 'png', 'fast/dom/prototype-strawberry.html'],
                 ['python', 'echo', 'optimize-baselines',
                  '--suffixes', 'txt', 'fast/dom/prototype-taco.html'],
             ],
             ['git', 'cl', 'upload', '-f'],
             ['git', 'pull'],
             ['git', 'cl', 'land', '-f', '-v'],
             ['git', 'config', 'branch.auto-rebaseline-temporary-branch.rietveldissue'],
+            ['git', 'cl', 'set_close'],
         ])
 
         # The mac ports should both be removed since they're the only ones in builders._exact_matches.
         self.assertEqual(self.tool.filesystem.read_text_file(test_port.path_to_generic_test_expectations_file()), """
 crbug.com/24182 [ Debug ] path/to/norebaseline.html [ Rebaseline ]
 Bug(foo) [ Linux Win ] fast/dom/prototype-taco.html [ NeedsRebaseline ]
 crbug.com/24182 [ Linux Win ] fast/dom/prototype-chocolate.html [ NeedsRebaseline ]
 crbug.com/24182 path/to/not-cycled-through-bots.html [ NeedsRebaseline ]
 crbug.com/24182 path/to/locally-changed-lined.html [ NeedsRebaseline ]
 """)
@@ skipping 84 matching lines @@
             "MOCK Mac10.11": {"port_name": "test-mac-mac10.11", "specifiers": ["Mac10.11", "Release"]},
         })
 
         self.command.tree_status = lambda: 'open'
         self._execute_with_mock_options()
         self.assertEqual(self.tool.executive.calls, [
             ['git', 'cl', 'upload', '-f'],
             ['git', 'pull'],
             ['git', 'cl', 'land', '-f', '-v'],
             ['git', 'config', 'branch.auto-rebaseline-temporary-branch.rietveldissue'],
+            ['git', 'cl', 'set_close'],
         ])
 
         # The mac ports should both be removed since they're the only ones in builders._exact_matches.
         self.assertEqual(self.tool.filesystem.read_text_file(test_port.path_to_generic_test_expectations_file()), """
 Bug(foo) [ Linux Win ] fast/dom/prototype-taco.html [ NeedsRebaseline ]
 """)
 
     def test_execute_use_alternate_rebaseline_branch(self):
         def blame(_):
             return """
@@ skipping 31 matching lines @@
         old_branch_name = self.tool.scm().current_branch_or_ref
         try:
             self.command.tree_status = lambda: 'open'
             self.tool.scm().current_branch_or_ref = lambda: 'auto-rebaseline-temporary-branch'
             self._execute_with_mock_options()
             self.assertEqual(self.tool.executive.calls, [
                 ['git', 'cl', 'upload', '-f'],
                 ['git', 'pull'],
                 ['git', 'cl', 'land', '-f', '-v'],
                 ['git', 'config', 'branch.auto-rebaseline-alt-temporary-branch.rietveldissue'],
+                ['git', 'cl', 'set_close'],
             ])
 
             self.assertEqual(self.tool.filesystem.read_text_file(test_port.path_to_generic_test_expectations_file()), """
 Bug(foo) [ Linux Mac Win10 ] fast/dom/prototype-taco.html [ NeedsRebaseline ]
 """)
         finally:
             self.tool.scm().current_branch_or_ref = old_branch_name
 
     def test_execute_stuck_on_alternate_rebaseline_branch(self):
         def blame(_):
@@ skipping 32 matching lines @@
         old_branch_name = self.tool.scm().current_branch_or_ref
         try:
             self.command.tree_status = lambda: 'open'
             self.tool.scm().current_branch_or_ref = lambda: 'auto-rebaseline-alt-temporary-branch'
             self._execute_with_mock_options()
             self.assertEqual(self.tool.executive.calls, [
                 ['git', 'cl', 'upload', '-f'],
                 ['git', 'pull'],
                 ['git', 'cl', 'land', '-f', '-v'],
                 ['git', 'config', 'branch.auto-rebaseline-temporary-branch.rietveldissue'],
+                ['git', 'cl', 'set_close'],
             ])
 
             self.assertEqual(self.tool.filesystem.read_text_file(test_port.path_to_generic_test_expectations_file()), """
 Bug(foo) [ Linux Mac Win10 ] fast/dom/prototype-taco.html [ NeedsRebaseline ]
 """)
         finally:
             self.tool.scm().current_branch_or_ref = old_branch_name
 
     def _basic_execute_test(self, expected_executive_calls, auth_refresh_token_json=None, commit_author=None, dry_run=False):
         def blame(_):
@@ skipping 43 matching lines @@
 """)
 
     def test_execute_with_rietveld_auth_refresh_token(self):
         rietveld_refresh_token = '/creds/refresh_tokens/test_rietveld_token'
         self._basic_execute_test(
             [
                 ['git', 'cl', 'upload', '-f', '--auth-refresh-token-json', rietveld_refresh_token],
                 ['git', 'pull'],
                 ['git', 'cl', 'land', '-f', '-v', '--auth-refresh-token-json', rietveld_refresh_token],
                 ['git', 'config', 'branch.auto-rebaseline-temporary-branch.rietveldissue'],
+                ['git', 'cl', 'set_close', '--auth-refresh-token-json', rietveld_refresh_token],
             ],
             auth_refresh_token_json=rietveld_refresh_token)
 
     def test_execute_with_dry_run(self):
         self._basic_execute_test([], dry_run=True)
         self.assertEqual(self.tool.scm().local_commits(), [])
 
     def test_bot_revision_data(self):
         self._setup_mock_build_data()
         self.assertEqual(
             self.command.bot_revision_data(self.tool.scm()),
             [{'builder': 'MOCK Win7', 'revision': '9000'}])