Rebaseline the actual missing results only

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

 # Copyright (c) 2010 Google Inc. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
 #     * Redistributions of source code must retain the above copyright
 # notice, this list of conditions and the following disclaimer.
 #     * Redistributions in binary form must reproduce the above
 # copyright notice, this list of conditions and the following disclaimer
@@ skipping 13 matching lines @@
 # DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 """Starts a local HTTP server which displays layout test failures (given a test
 results directory), provides comparisons of expected and actual results (both
 images and text) and allows one-click rebaselining of tests."""
 
 from webkitpy.common.host import Host
-from webkitpy.common.net.layouttestresults import for_each_test, JSONTestResult
+from webkitpy.common.net.layouttestresults import LayoutTestResults
 from webkitpy.layout_tests.layout_package import json_results_generator
 from webkitpy.tool.commands.abstractlocalservercommand import AbstractLocalServerCommand
 from webkitpy.tool.servers.rebaselineserver import get_test_baselines, RebaselineHTTPServer, STATE_NEEDS_REBASELINE
 
 
 class TestConfig(object):
 
     def __init__(self, test_port, layout_tests_directory, results_directory, platforms, host):
         self.test_port = test_port
         self.layout_tests_directory = layout_tests_directory
@@ skipping 11 matching lines @@
     argument_names = "/path/to/results/directory"
 
     server = RebaselineHTTPServer
 
     def _gather_baselines(self, results_json):
         # Rebaseline server and it's associated JavaScript expected the tests subtree to
         # be key-value pairs instead of hierarchical.
         # FIXME: make the rebaseline server use the hierarchical tree.
         new_tests_subtree = {}
 
-        def gather_baselines_for_test(test_name, result_dict):
-            result = JSONTestResult(test_name, result_dict)
+        def gather_baselines_for_test(result):
             if result.did_pass_or_run_as_expected():
                 return
+            result_dict = result.result_dict()
             result_dict['state'] = STATE_NEEDS_REBASELINE
-            result_dict['baselines'] = get_test_baselines(test_name, self._test_config)
-            new_tests_subtree[test_name] = result_dict
+            result_dict['baselines'] = get_test_baselines(result.test_name(), self._test_config)
+            new_tests_subtree[result.test_name()] = result_dict
 
-        for_each_test(results_json['tests'], gather_baselines_for_test)
+        LayoutTestResults(results_json).for_each_test(gather_baselines_for_test)
         results_json['tests'] = new_tests_subtree
 
     def _prepare_config(self, options, args, tool):
         results_directory = args[0]
         host = Host()
         host.initialize_scm()
 
         print 'Parsing full_results.json...'
         results_json_path = host.filesystem.join(results_directory, 'full_results.json')
         results_json = json_results_generator.load_json(host.filesystem, results_json_path)
 
         port = tool.port_factory.get()
         layout_tests_directory = port.layout_tests_dir()
         platforms = host.filesystem.listdir(host.filesystem.join(layout_tests_directory, 'platform'))
         self._test_config = TestConfig(port, layout_tests_directory, results_directory, platforms, host)
 
         print 'Gathering current baselines...'
         self._gather_baselines(results_json)
 
         return {
             'test_config': self._test_config,
             "results_json": results_json,
             "platforms_json": {
                 'platforms': platforms,
                 'defaultPlatform': port.name(),
             },
         }