OLD | NEW |
1 # Copyright (c) 2010 Google Inc. All rights reserved. | 1 # Copyright (c) 2010 Google Inc. All rights reserved. |
2 # | 2 # |
3 # Redistribution and use in source and binary forms, with or without | 3 # Redistribution and use in source and binary forms, with or without |
4 # modification, are permitted provided that the following conditions are | 4 # modification, are permitted provided that the following conditions are |
5 # met: | 5 # met: |
6 # | 6 # |
7 # * Redistributions of source code must retain the above copyright | 7 # * Redistributions of source code must retain the above copyright |
8 # notice, this list of conditions and the following disclaimer. | 8 # notice, this list of conditions and the following disclaimer. |
9 # * Redistributions in binary form must reproduce the above | 9 # * Redistributions in binary form must reproduce the above |
10 # copyright notice, this list of conditions and the following disclaimer | 10 # copyright notice, this list of conditions and the following disclaimer |
(...skipping 13 matching lines...) Expand all Loading... |
24 # DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | 24 # DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
25 # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 25 # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
26 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 26 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
27 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 27 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
28 | 28 |
29 """Starts a local HTTP server which displays layout test failures (given a test | 29 """Starts a local HTTP server which displays layout test failures (given a test |
30 results directory), provides comparisons of expected and actual results (both | 30 results directory), provides comparisons of expected and actual results (both |
31 images and text) and allows one-click rebaselining of tests.""" | 31 images and text) and allows one-click rebaselining of tests.""" |
32 | 32 |
33 from webkitpy.common import system | 33 from webkitpy.common import system |
| 34 from webkitpy.common.host import Host |
34 from webkitpy.common.net.layouttestresults import for_each_test, JSONTestResult | 35 from webkitpy.common.net.layouttestresults import for_each_test, JSONTestResult |
35 from webkitpy.layout_tests.layout_package import json_results_generator | 36 from webkitpy.layout_tests.layout_package import json_results_generator |
36 from webkitpy.tool.commands.abstractlocalservercommand import AbstractLocalServe
rCommand | 37 from webkitpy.tool.commands.abstractlocalservercommand import AbstractLocalServe
rCommand |
37 from webkitpy.tool.servers.rebaselineserver import get_test_baselines, Rebaselin
eHTTPServer, STATE_NEEDS_REBASELINE | 38 from webkitpy.tool.servers.rebaselineserver import get_test_baselines, Rebaselin
eHTTPServer, STATE_NEEDS_REBASELINE |
38 | 39 |
39 | 40 |
40 class TestConfig(object): | 41 class TestConfig(object): |
41 def __init__(self, test_port, layout_tests_directory, results_directory, pla
tforms, filesystem, scm): | 42 def __init__(self, test_port, layout_tests_directory, results_directory, pla
tforms, host): |
42 self.test_port = test_port | 43 self.test_port = test_port |
43 self.layout_tests_directory = layout_tests_directory | 44 self.layout_tests_directory = layout_tests_directory |
44 self.results_directory = results_directory | 45 self.results_directory = results_directory |
45 self.platforms = platforms | 46 self.platforms = platforms |
46 self.filesystem = filesystem | 47 self.host = host |
47 self.scm = scm | 48 self.filesystem = host.filesystem |
| 49 self.scm = host.scm() |
48 | 50 |
49 | 51 |
50 class RebaselineServer(AbstractLocalServerCommand): | 52 class RebaselineServer(AbstractLocalServerCommand): |
51 name = "rebaseline-server" | 53 name = "rebaseline-server" |
52 help_text = __doc__ | 54 help_text = __doc__ |
53 show_in_main_help = True | 55 show_in_main_help = True |
54 argument_names = "/path/to/results/directory" | 56 argument_names = "/path/to/results/directory" |
55 | 57 |
56 server = RebaselineHTTPServer | 58 server = RebaselineHTTPServer |
57 | 59 |
58 def _gather_baselines(self, results_json): | 60 def _gather_baselines(self, results_json): |
59 # Rebaseline server and it's associated JavaScript expected the tests su
btree to | 61 # Rebaseline server and it's associated JavaScript expected the tests su
btree to |
60 # be key-value pairs instead of hierarchical. | 62 # be key-value pairs instead of hierarchical. |
61 # FIXME: make the rebaseline server use the hierarchical tree. | 63 # FIXME: make the rebaseline server use the hierarchical tree. |
62 new_tests_subtree = {} | 64 new_tests_subtree = {} |
63 | 65 |
64 def gather_baselines_for_test(test_name, result_dict): | 66 def gather_baselines_for_test(test_name, result_dict): |
65 result = JSONTestResult(test_name, result_dict) | 67 result = JSONTestResult(test_name, result_dict) |
66 if result.did_pass_or_run_as_expected(): | 68 if result.did_pass_or_run_as_expected(): |
67 return | 69 return |
68 result_dict['state'] = STATE_NEEDS_REBASELINE | 70 result_dict['state'] = STATE_NEEDS_REBASELINE |
69 result_dict['baselines'] = get_test_baselines(test_name, self._test_
config) | 71 result_dict['baselines'] = get_test_baselines(test_name, self._test_
config) |
70 new_tests_subtree[test_name] = result_dict | 72 new_tests_subtree[test_name] = result_dict |
71 | 73 |
72 for_each_test(results_json['tests'], gather_baselines_for_test) | 74 for_each_test(results_json['tests'], gather_baselines_for_test) |
73 results_json['tests'] = new_tests_subtree | 75 results_json['tests'] = new_tests_subtree |
74 | 76 |
75 def _prepare_config(self, options, args, tool): | 77 def _prepare_config(self, options, args, tool): |
76 results_directory = args[0] | 78 results_directory = args[0] |
77 filesystem = system.filesystem.FileSystem() | 79 host = Host() |
78 scm = self._tool.scm() | 80 host.initialize_scm() |
79 | 81 |
80 print 'Parsing full_results.json...' | 82 print 'Parsing full_results.json...' |
81 results_json_path = filesystem.join(results_directory, 'full_results.jso
n') | 83 results_json_path = host.filesystem.join(results_directory, 'full_result
s.json') |
82 results_json = json_results_generator.load_json(filesystem, results_json
_path) | 84 results_json = json_results_generator.load_json(host.filesystem, results
_json_path) |
83 | 85 |
84 port = tool.port_factory.get() | 86 port = tool.port_factory.get() |
85 layout_tests_directory = port.layout_tests_dir() | 87 layout_tests_directory = port.layout_tests_dir() |
86 platforms = filesystem.listdir(filesystem.join(layout_tests_directory, '
platform')) | 88 platforms = host.filesystem.listdir(host.filesystem.join(layout_tests_di
rectory, 'platform')) |
87 self._test_config = TestConfig(port, layout_tests_directory, results_dir
ectory, platforms, filesystem, scm) | 89 self._test_config = TestConfig(port, layout_tests_directory, results_dir
ectory, platforms, host) |
88 | 90 |
89 print 'Gathering current baselines...' | 91 print 'Gathering current baselines...' |
90 self._gather_baselines(results_json) | 92 self._gather_baselines(results_json) |
91 | 93 |
92 return { | 94 return { |
93 'test_config': self._test_config, | 95 'test_config': self._test_config, |
94 "results_json": results_json, | 96 "results_json": results_json, |
95 "platforms_json": { | 97 "platforms_json": { |
96 'platforms': platforms, | 98 'platforms': platforms, |
97 'defaultPlatform': port.name(), | 99 'defaultPlatform': port.name(), |
98 }, | 100 }, |
99 } | 101 } |
OLD | NEW |