Remove self._builder_data from Rebaseline classes.

third_party/WebKit/Tools/Scripts/webkitpy/tool/commands/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 unittest
 
 from webkitpy.common.net.buildbot_mock import MockBuilder
 from webkitpy.common.net.layouttestresults import LayoutTestResults
 from webkitpy.common.system.executive_mock import MockExecutive
 from webkitpy.common.system.executive_mock import MockExecutive2
@@ skipping 34 matching lines @@
         self.tool.filesystem.write_text_file(
             self.tool.filesystem.join(self.mac_port.layout_tests_dir(), "VirtualTestSuites"), '[]')
 
         # In AbstractParallelRebaselineCommand._rebaseline_commands, a default port
         # object is gotten using self.tool.port_factory.get(), which is used to get
         # test paths -- and the layout tests directory may be different for the "test"
         # ports and real ports. Since only "test" ports are used in this class,
         # we can make the default port also a "test" port.
         self.original_port_factory_get = self.tool.port_factory.get
         test_port = self.tool.port_factory.get('test')
+        self._builder_data = {}
 
         def get_test_port(port_name=None, options=None, **kwargs):
             if not port_name:
                 return test_port
             return self.original_port_factory_get(port_name, options, **kwargs)
 
         self.tool.port_factory.get = get_test_port
 
     def tearDown(self):
         self.tool.port_factory.get = self.original_port_factory_get
@@ skipping 24 matching lines @@
                         "expected": "PASS",
                         "actual": "IMAGE+TEXT"
                     },
                     "second-test.html": {
                         "expected": "FAIL",
                         "actual": "IMAGE+TEXT"
                     }
                 }
             }
         })
-        for builder in ['MOCK Win7', 'MOCK Win7 (dbg)', 'MOCK Mac10.11']:
-            self.command._builder_data[builder] = data
+
+        def builder_data():
+            self._builder_data = {}
+            for builder in ['MOCK Win7', 'MOCK Win7 (dbg)', 'MOCK Mac10.11']:
+                self._builder_data[builder] = data
+            return self._builder_data
+
+        self.command.builder_data = builder_data
 
 class TestCopyExistingBaselinesInternal(BaseTestCase):
     command_constructor = CopyExistingBaselinesInternal
 
     def setUp(self):
         super(TestCopyExistingBaselinesInternal, self).setUp()
 
     def test_copying_overwritten_baseline(self):
         self.tool.executive = MockExecutive2()
 
@@ skipping 219 matching lines @@
         super(TestRebaselineJson, self).setUp()
         self.tool.executive = MockExecutive2()
 
     def tearDown(self):
         super(TestRebaselineJson, self).tearDown()
 
     def test_rebaseline_test_passes_on_all_builders(self):
         self._setup_mock_builder_data()
 
         def builder_data():
-            self.command._builder_data['MOCK Win7'] = LayoutTestResults({
+            self._builder_data['MOCK Win7'] = LayoutTestResults({
                 "tests": {
                     "userscripts": {
                         "first-test.html": {
                             "expected": "NEEDSREBASELINE",
                             "actual": "PASS"
                         }
                     }
                 }
             })
-            return self.command._builder_data
+            return self._builder_data
 
         self.command.builder_data = builder_data
 
         options = MockOptions(optimize=True, verbose=True, results_directory=None)
 
         self._write(self.mac_expectations_path, "Bug(x) userscripts/first-test.html [ Failure ]\n")
         self._write("userscripts/first-test.html", "Dummy test contents")
 
         self.command._rebaseline(options, {"userscripts/first-test.html": {"MOCK Win7": ["txt", "png"]}})
 
@@ skipping 234 matching lines @@
     def _write_test_file(self, port, path, contents):
         abs_path = self.tool.filesystem.join(port.layout_tests_dir(), path)
         self.tool.filesystem.write_text_file(abs_path, contents)
 
     def test_rebaseline_expectations(self):
         self._zero_out_test_expectations()
 
         self.tool.executive = MockExecutive2()
 
         def builder_data():
-            self.command._builder_data['MOCK Mac10.11'] = self.command._builder_data['MOCK Mac10.10'] = LayoutTestResults({
+            self._builder_data['MOCK Mac10.11'] = self._builder_data['MOCK Mac10.10'] = LayoutTestResults({
                 "tests": {
                     "userscripts": {
                         "another-test.html": {
                             "expected": "PASS",
                             "actual": "PASS TEXT"
                         },
                         "images.svg": {
                             "expected": "FAIL",
                             "actual": "IMAGE+TEXT"
                         }
                     }
                 }
             })
-            return self.command._builder_data
+            return self._builder_data
 
         self.command.builder_data = builder_data
 
         self._write("userscripts/another-test.html", "Dummy test contents")
         self._write("userscripts/images.svg", "Dummy test contents")
         self.command._tests_to_rebaseline = lambda port: {
             'userscripts/another-test.html': set(['txt']),
             'userscripts/images.svg': set(['png']),
             'userscripts/not-actually-failing.html': set(['txt', 'png', 'wav']),
         }
@@ skipping 22 matching lines @@
                  '--builder', 'MOCK Mac10.11', '--test', 'userscripts/images.svg'],
             ],
         ])
 
     def test_rebaseline_expectations_reftests(self):
         self._zero_out_test_expectations()
 
         self.tool.executive = MockExecutive2()
 
         def builder_data():
-            self.command._builder_data['MOCK Mac10.10'] = self.command._builder_data['MOCK Mac10.11'] = LayoutTestResults({
+            self._builder_data['MOCK Mac10.10'] = self._builder_data['MOCK Mac10.11'] = LayoutTestResults({
                 "tests": {
                     "userscripts": {
                         "reftest-text.html": {
                             "expected": "PASS",
                             "actual": "TEXT"
                         },
                         "reftest-image.html": {
                             "expected": "FAIL",
                             "actual": "IMAGE"
                         },
                         "reftest-image-text.html": {
                             "expected": "FAIL",
                             "actual": "IMAGE+TEXT"
                         }
                     }
                 }
             })
-            return self.command._builder_data
+            return self._builder_data
 
         self.command.builder_data = builder_data
 
         self._write("userscripts/reftest-text.html", "Dummy test contents")
         self._write("userscripts/reftest-text-expected.html", "Dummy test contents")
         self._write("userscripts/reftest-text-expected.html", "Dummy test contents")
         self.command._tests_to_rebaseline = lambda port: {
             'userscripts/reftest-text.html': set(['txt']),
             'userscripts/reftest-image.html': set(['png']),
             'userscripts/reftest-image-text.html': set(['png', 'txt']),
@@ skipping 47 matching lines @@
     def test_rebaseline_without_other_expectations(self):
         self._write("userscripts/another-test.html", "Dummy test contents")
         self._write(self.mac_expectations_path, "Bug(x) userscripts/another-test.html [ Rebaseline ]\n")
         self.assertDictEqual(self.command._tests_to_rebaseline(self.mac_port),
                              {'userscripts/another-test.html': ('png', 'wav', 'txt')})
 
     def test_rebaseline_test_passes_everywhere(self):
         test_port = self.tool.port_factory.get('test')
 
         def builder_data():
-            self.command._builder_data['MOCK Mac10.10'] = self.command._builder_data['MOCK Mac10.11'] = LayoutTestResults({
+            self._builder_data['MOCK Mac10.10'] = self._builder_data['MOCK Mac10.11'] = LayoutTestResults({
                 "tests": {
                     "fast": {
                         "dom": {
                             "prototype-taco.html": {
                                 "expected": "FAIL",
                                 "actual": "PASS",
                                 "is_unexpected": True
                             }
                         }
                     }
                 }
             })
-            return self.command._builder_data
+            return self._builder_data
 
         self.command.builder_data = builder_data
 
         self.tool.filesystem.write_text_file(test_port.path_to_generic_test_expectations_file(), """
 Bug(foo) fast/dom/prototype-taco.html [ Rebaseline ]
 """)
 
         self._write_test_file(test_port, 'fast/dom/prototype-taco.html', "Dummy test contents")
 
         self.tool.executive = MockLineRemovingExecutive()
 
         self.tool.builders = BuilderList({
             "MOCK Mac10.10": {"port_name": "test-mac-mac10.10", "specifiers": ["Mac10.10", "Release"]},
             "MOCK Mac10.11": {"port_name": "test-mac-mac10.11", "specifiers": ["Mac10.11", "Release"]},
         })
 
         self.command.execute(self.options, [], self.tool)
         self.assertEqual(self.tool.executive.calls, [])
 
         # The mac ports should both be removed since they're the only ones in the builder list.
         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 [ Rebaseline ]
 """)
 
     def test_rebaseline_missing(self):
         def builder_data():
-            self.command._builder_data['MOCK Mac10.10'] = LayoutTestResults({
+            self._builder_data['MOCK Mac10.10'] = LayoutTestResults({
                 "tests": {
                     "fast": {
                         "dom": {
                             "missing-text.html": {
                                 "expected": "PASS",
                                 "actual": "MISSING",
                                 "is_unexpected": True,
                                 "is_missing_text": True
                             },
                             "missing-text-and-image.html": {
                                 "expected": "PASS",
                                 "actual": "MISSING",
                                 "is_unexpected": True,
                                 "is_missing_text": True,
                                 "is_missing_image": True
                             },
                             "missing-image.html": {
                                 "expected": "PASS",
                                 "actual": "MISSING",
                                 "is_unexpected": True,
                                 "is_missing_image": True
                             }
                         }
                     }
                 }
             })
-            return self.command._builder_data
+            return self._builder_data
 
         self.command.builder_data = builder_data
 
         self._write('fast/dom/missing-text.html', "Dummy test contents")
         self._write('fast/dom/missing-text-and-image.html', "Dummy test contents")
         self._write('fast/dom/missing-image.html', "Dummy test contents")
 
         self.command._tests_to_rebaseline = lambda port: {
             'fast/dom/missing-text.html': set(['txt', 'png']),
             'fast/dom/missing-text-and-image.html': set(['txt', 'png']),
@@ skipping 216 matching lines @@
 6469e754a1 path/to/TestExpectations                   (<foobarbaz1@chromium.org> 2013-04-28 04:52:41 +0000   13) Bug(foo) fast/dom/prototype-taco.html [ NeedsRebaseline ]
 6469e754a1 path/to/TestExpectations                   (<foobarbaz1@chromium.org> 2013-06-14 20:18:46 +0000   11) crbug.com/24182 [ Mac10.11 ] fast/dom/prototype-strawberry.html [ NeedsRebaseline ]
 6469e754a1 path/to/TestExpectations                   (<foobarbaz1@chromium.org> 2013-04-28 04:52:41 +0000   12) crbug.com/24182 fast/dom/prototype-chocolate.html [ NeedsRebaseline ]
 624caaaaaa path/to/TestExpectations                   (<foo@chromium.org>        2013-04-28 04:52:41 +0000   12) crbug.com/24182 path/to/not-cycled-through-bots.html [ NeedsRebaseline ]
 0000000000 path/to/TestExpectations                   (<foo@chromium.org>        2013-04-28 04:52:41 +0000   12) crbug.com/24182 path/to/locally-changed-lined.html [ NeedsRebaseline ]
 """
         self.tool.scm().blame = blame
 
         test_port = self.tool.port_factory.get('test')
 
-        original_builder_data = self.command.builder_data
         def builder_data():
-            original_builder_data()
             # Have prototype-chocolate only fail on "MOCK Mac10.11".
-            self.command._builder_data['MOCK Mac10.11'] = LayoutTestResults({
+            self._builder_data['MOCK Mac10.11'] = LayoutTestResults({
                 "tests": {
                     "fast": {
                         "dom": {
                             "prototype-taco.html": {
                                 "expected": "PASS",
                                 "actual": "PASS TEXT",
                                 "is_unexpected": True
                             },
                             "prototype-chocolate.html": {
                                 "expected": "FAIL",
                                 "actual": "PASS"
                             },
                             "prototype-strawberry.html": {
                                 "expected": "PASS",
                                 "actual": "IMAGE PASS",
                                 "is_unexpected": True
                             }
                         }
                     }
                 }
             })
-            return self.command._builder_data
+            return self._builder_data
 
         self.command.builder_data = builder_data
 
         self.tool.filesystem.write_text_file(test_port.path_to_generic_test_expectations_file(), """
 crbug.com/24182 [ Debug ] path/to/norebaseline.html [ Rebaseline ]
 Bug(foo) fast/dom/prototype-taco.html [ NeedsRebaseline ]
 crbug.com/24182 [ Mac10.11 ] fast/dom/prototype-strawberry.html [ NeedsRebaseline ]
 crbug.com/24182 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 13 matching lines @@
         self.command.tree_status = lambda: 'closed'
         self._execute_command_with_mock_options()
         self.assertEqual(self.tool.executive.calls, [])
 
         self.command.tree_status = lambda: 'open'
         self.tool.executive.calls = []
         self._execute_command_with_mock_options()
 
         self.assertEqual(self.tool.executive.calls, [
             [
-                ['python', 'echo', 'copy-existing-baselines-internal', '--suffixes', 'txt,png',
-                 '--builder', 'MOCK Mac10.10', '--test', 'fast/dom/prototype-chocolate.html'],
                 ['python', 'echo', 'copy-existing-baselines-internal', '--suffixes', 'png',
                  '--builder', 'MOCK Mac10.11', '--test', 'fast/dom/prototype-strawberry.html'],
                 ['python', 'echo', 'copy-existing-baselines-internal', '--suffixes', 'txt',
-                 '--builder', 'MOCK Mac10.10', '--test', 'fast/dom/prototype-taco.html'],
-                ['python', 'echo', 'copy-existing-baselines-internal', '--suffixes', 'txt',
                  '--builder', 'MOCK Mac10.11', '--test', 'fast/dom/prototype-taco.html'],
             ],
             [
-                ['python', 'echo', 'rebaseline-test-internal', '--suffixes', 'txt,png',
-                 '--builder', 'MOCK Mac10.10', '--test', 'fast/dom/prototype-chocolate.html'],
-                ['python', 'echo', 'rebaseline-test-internal', '--suffixes', 'png', '--builder',
-                 'MOCK Mac10.11', '--test', 'fast/dom/prototype-strawberry.html'],
-                ['python', 'echo', 'rebaseline-test-internal', '--suffixes', 'txt',
-                 '--builder', 'MOCK Mac10.10', '--test', 'fast/dom/prototype-taco.html'],
+                ['python', 'echo', 'rebaseline-test-internal', '--suffixes', 'png',
+                 '--builder', 'MOCK Mac10.11', '--test', 'fast/dom/prototype-strawberry.html'],
                 ['python', 'echo', 'rebaseline-test-internal', '--suffixes', 'txt',
                  '--builder', 'MOCK Mac10.11', '--test', 'fast/dom/prototype-taco.html'],
             ],
             [
                 ['python', 'echo', 'optimize-baselines', '--no-modify-scm',
-                 '--suffixes', 'txt,png', 'fast/dom/prototype-chocolate.html'],
+                 '--suffixes', 'png', 'fast/dom/prototype-strawberry.html'],
                 ['python', 'echo', 'optimize-baselines', '--no-modify-scm',
-                 '--suffixes', 'png', 'fast/dom/prototype-strawberry.html'],
-                ['python', 'echo', 'optimize-baselines', '--no-modify-scm', '--suffixes', 'txt', 'fast/dom/prototype-taco.html'],
+                 '--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'],
         ])
 
         # 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 ]
 """)
 
     def test_execute_git_cl_hangs(self):
         def blame(_):
             return """
 6469e754a1 path/to/TestExpectations                   (<foobarbaz1@chromium.org> 2013-04-28 04:52:41 +0000   13) Bug(foo) fast/dom/prototype-taco.html [ NeedsRebaseline ]
 """
         self.tool.scm().blame = blame
 
         test_port = self.tool.port_factory.get('test')
 
         original_builder_data = self.command.builder_data
         def builder_data():
             original_builder_data()
-            # have prototype-chocolate only fail on "MOCK Mac10.10".
-            self.command._builder_data['MOCK Mac10.11'] = LayoutTestResults({
+            # Have prototype-chocolate only fail on "MOCK Mac10.11".
+            self._builder_data['MOCK Mac10.11'] = LayoutTestResults({
                 "tests": {
                     "fast": {
                         "dom": {
                             "prototype-taco.html": {
                                 "expected": "PASS",
                                 "actual": "PASS TEXT",
                                 "is_unexpected": True
                             }
                         }
                     }
                 }
             })
-            return self.command._builder_data
+            return self._builder_data
 
         self.command.builder_data = builder_data
 
         self.tool.filesystem.write_text_file(test_port.path_to_generic_test_expectations_file(), """
 Bug(foo) fast/dom/prototype-taco.html [ NeedsRebaseline ]
 """)
 
         self._write_test_file(test_port, 'fast/dom/prototype-taco.html', "Dummy test contents")
 
         self.tool.builders = BuilderList({
@@ skipping 22 matching lines @@
     def test_execute_test_passes_everywhere(self):
         def blame(_):
             return """
 6469e754a1 path/to/TestExpectations                   (<foobarbaz1@chromium.org> 2013-04-28 04:52:41 +0000   13) Bug(foo) fast/dom/prototype-taco.html [ NeedsRebaseline ]
 """
         self.tool.scm().blame = blame
 
         test_port = self.tool.port_factory.get('test')
 
         def builder_data():
-            self.command._builder_data['MOCK Mac10.10'] = self.command._builder_data['MOCK Mac10.11'] = LayoutTestResults({
+            self._builder_data['MOCK Mac10.10'] = self._builder_data['MOCK Mac10.11'] = LayoutTestResults({
                 "tests": {
                     "fast": {
                         "dom": {
                             "prototype-taco.html": {
                                 "expected": "FAIL",
                                 "actual": "PASS",
                                 "is_unexpected": True
                             }
                         }
                     }
                 }
             })
-            return self.command._builder_data
+            return self._builder_data
 
         self.command.builder_data = builder_data
 
         self.tool.filesystem.write_text_file(test_port.path_to_generic_test_expectations_file(), """
 Bug(foo) fast/dom/prototype-taco.html [ NeedsRebaseline ]
 """)
 
         self._write_test_file(test_port, 'fast/dom/prototype-taco.html', "Dummy test contents")
 
         self.tool.executive = MockLineRemovingExecutive()
@@ skipping 20 matching lines @@
     def test_execute_use_alternate_rebaseline_branch(self):
         def blame(_):
             return """
 6469e754a1 path/to/TestExpectations                   (<foobarbaz1@chromium.org> 2013-04-28 04:52:41 +0000   13) Bug(foo) fast/dom/prototype-taco.html [ NeedsRebaseline ]
 """
         self.tool.scm().blame = blame
 
         test_port = self.tool.port_factory.get('test')
 
         def builder_data():
-            self.command._builder_data['MOCK Win'] = LayoutTestResults({
+            self._builder_data['MOCK Win'] = LayoutTestResults({
                 "tests": {
                     "fast": {
                         "dom": {
                             "prototype-taco.html": {
                                 "expected": "FAIL",
                                 "actual": "PASS",
                                 "is_unexpected": True
                             }
                         }
                     }
                 }
             })
-            return self.command._builder_data
+            return self._builder_data
 
         self.command.builder_data = builder_data
 
         self.tool.filesystem.write_text_file(test_port.path_to_generic_test_expectations_file(), """
 Bug(foo) fast/dom/prototype-taco.html [ NeedsRebaseline ]
 """)
 
         self._write_test_file(test_port, 'fast/dom/prototype-taco.html', "Dummy test contents")
 
         self.tool.executive = MockLineRemovingExecutive()
@@ skipping 22 matching lines @@
     def test_execute_stuck_on_alternate_rebaseline_branch(self):
         def blame(_):
             return """
 6469e754a1 path/to/TestExpectations                   (<foobarbaz1@chromium.org> 2013-04-28 04:52:41 +0000   13) Bug(foo) fast/dom/prototype-taco.html [ NeedsRebaseline ]
 """
         self.tool.scm().blame = blame
 
         test_port = self.tool.port_factory.get('test')
 
         def builder_data():
-            self.command._builder_data['MOCK Win'] = LayoutTestResults({
+            self._builder_data['MOCK Win'] = LayoutTestResults({
                 "tests": {
                     "fast": {
                         "dom": {
                             "prototype-taco.html": {
                                 "expected": "FAIL",
                                 "actual": "PASS",
                                 "is_unexpected": True
                             }
                         }
                     }
                 }
             })
-            return self.command._builder_data
+            return self._builder_data
 
         self.command.builder_data = builder_data
 
         self.tool.filesystem.write_text_file(test_port.path_to_generic_test_expectations_file(), """
 Bug(foo) fast/dom/prototype-taco.html [ NeedsRebaseline ]
 """)
 
         self._write_test_file(test_port, 'fast/dom/prototype-taco.html', "Dummy test contents")
 
         self.tool.executive = MockLineRemovingExecutive()
@@ skipping 23 matching lines @@
     def _basic_execute_test(self, expected_executive_calls, auth_refresh_token_json=None, commit_author=None, dry_run=False):
         def blame(_):
             return """
 6469e754a1 path/to/TestExpectations                   (<foobarbaz1@chromium.org> 2013-04-28 04:52:41 +0000   13) Bug(foo) fast/dom/prototype-taco.html [ NeedsRebaseline ]
 """
         self.tool.scm().blame = blame
 
         test_port = self.tool.port_factory.get('test')
 
         def builder_data():
-            self.command._builder_data['MOCK Mac10.10'] = self.command._builder_data['MOCK Mac10.11'] = LayoutTestResults({
+            self._builder_data['MOCK Mac10.10'] = self._builder_data['MOCK Mac10.11'] = LayoutTestResults({
                 "tests": {
                     "fast": {
                         "dom": {
                             "prototype-taco.html": {
                                 "expected": "FAIL",
                                 "actual": "PASS",
                                 "is_unexpected": True
                             }
                         }
                     }
                 }
             })
-            return self.command._builder_data
+            return self._builder_data
 
         self.command.builder_data = builder_data
 
         self.tool.filesystem.write_text_file(test_port.path_to_generic_test_expectations_file(), """
 Bug(foo) fast/dom/prototype-taco.html [ NeedsRebaseline ]
 """)
 
         self._write_test_file(test_port, 'fast/dom/prototype-taco.html', "Dummy test contents")
 
         self.tool.executive = MockLineRemovingExecutive()
@@ skipping 20 matching lines @@
                 ['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'],
             ],
             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(), [])