Make MockExecutive behave more like MockExecutive2.

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

Index: third_party/WebKit/Tools/Scripts/webkitpy/tool/commands/auto_rebaseline_unittest.py
diff --git a/third_party/WebKit/Tools/Scripts/webkitpy/tool/commands/auto_rebaseline_unittest.py b/third_party/WebKit/Tools/Scripts/webkitpy/tool/commands/auto_rebaseline_unittest.py
index ebcb694609aa5998c7d1f0e2d02dde4aa2e405bb..443fd8e539aa385850c28aa0470593197e2973b7 100644
--- a/third_party/WebKit/Tools/Scripts/webkitpy/tool/commands/auto_rebaseline_unittest.py
+++ b/third_party/WebKit/Tools/Scripts/webkitpy/tool/commands/auto_rebaseline_unittest.py
@@ -245,6 +245,7 @@ crbug.com/24182 path/to/locally-changed-lined.html [ NeedsRebaseline ]
             ['git', 'pull'],
             ['git', 'cl', 'land', '-f', '-v'],
             ['git', 'config', 'branch.auto-rebaseline-temporary-branch.rietveldissue'],
+            ['git', 'cl', 'set_close'],

[qyearsley, 2016/12/19 22:49:29]

The reason why this extra command is run is:

Previously in MockExecutive.run_command, the argument return_exit_code would
only make the function return 0 if should_return_zero_when_run was passed when
constructing the MockExecutive [1]. That was never passed, so in practice,
return_exit_code had no effect for MockExecutive.

After this change, MockExecutive returns self._exit_code (default 0) when
return_exit_code=True is passed.

This means that in auto_rebaseline.py [2] when running the tests,
issue_already_closed is 0, and an additional command is run.

In terms of what this means for this test: It means we're always going through
the code path where `git config branch.${branch}.rietveldissue` has an exit code
of zero, implying that the issue is isn't yet closed, so it calls `git cl
set_close`. The actual behavior of the code isn't changed, only the codepath
that's tested.

[1]
https://cs.chromium.org/chromium/src/third_party/WebKit/Tools/Scripts/webkitp...
[2]
https://cs.chromium.org/chromium/src/third_party/WebKit/Tools/Scripts/webkitp...

         ])
 
         # The mac ports should both be removed since they're the only ones in builders._exact_matches.
@@ -349,6 +350,7 @@ Bug(foo) fast/dom/prototype-taco.html [ NeedsRebaseline ]
             ['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.
@@ -400,6 +402,7 @@ Bug(foo) fast/dom/prototype-taco.html [ NeedsRebaseline ]
                 ['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()), """
@@ -452,6 +455,7 @@ Bug(foo) fast/dom/prototype-taco.html [ NeedsRebaseline ]
                 ['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()), """
@@ -515,6 +519,7 @@ Bug(foo) [ Linux Win ] fast/dom/prototype-taco.html [ NeedsRebaseline ]
                 ['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)