Changeset 100875 in webkit
- Timestamp:
- Nov 20, 2011 5:26:57 PM (12 years ago)
- Location:
- trunk/Tools
- Files:
-
- 3 edited
-
ChangeLog (modified) (1 diff)
-
TestResultServer/model/jsonresults.py (modified) (8 diffs)
-
TestResultServer/model/jsonresults_unittest.py (modified) (5 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/Tools/ChangeLog
r100873 r100875 1 2011-11-20 Ojan Vafai <ojan@chromium.org> 2 3 Change the final place where we use version 3 of the results json output 4 https://bugs.webkit.org/show_bug.cgi?id=72838 5 6 Reviewed by Adam Barth. 7 8 This converts the json from being a flat map of test name --> results 9 to being hierarchical by directory. This will make the json files 10 considerably smaller. 11 12 Also cleaned up some functions that were returning/checking boolean values 13 that were always True. 14 15 * TestResultServer/model/jsonresults.py: 16 * TestResultServer/model/jsonresults_unittest.py: 17 1 18 2011-11-20 Ojan Vafai <ojan@chromium.org> 2 19 -
trunk/Tools/TestResultServer/model/jsonresults.py
r100863 r100875 45 45 JSON_RESULTS_NO_DATA = "N" 46 46 JSON_RESULTS_MIN_TIME = 1 47 JSON_RESULTS_VERSION = 348 47 JSON_RESULTS_HIERARCHICAL_VERSION = 4 49 48 JSON_RESULTS_MAX_BUILDS = 750 50 49 JSON_RESULTS_MAX_BUILDS_SMALL = 200 50 51 52 def _add_path_to_trie(path, value, trie): 53 if not "/" in path: 54 trie[path] = value 55 return 56 57 directory, slash, rest = path.partition("/") 58 if not directory in trie: 59 trie[directory] = {} 60 _add_path_to_trie(rest, value, trie[directory]) 61 62 63 def _trie_json_tests(tests): 64 """Breaks a test name into chunks by directory and puts the test time as a value in the lowest part, e.g. 65 foo/bar/baz.html: VALUE1 66 foo/bar/baz1.html: VALUE2 67 68 becomes 69 foo: { 70 bar: { 71 baz.html: VALUE1, 72 baz1.html: VALUE2 73 } 74 } 75 """ 76 trie = {} 77 for test, value in tests.iteritems(): 78 _add_path_to_trie(test, value, trie) 79 return trie 51 80 52 81 … … 79 108 @classmethod 80 109 def _merge_json(cls, aggregated_json, incremental_json, num_runs): 81 if not cls._merge_non_test_data(aggregated_json, incremental_json, num_runs): 82 return False 83 110 cls._merge_non_test_data(aggregated_json, incremental_json, num_runs) 84 111 incremental_tests = incremental_json[JSON_RESULTS_TESTS] 85 112 if incremental_tests: … … 87 114 cls._merge_tests(aggregated_tests, incremental_tests, num_runs) 88 115 89 return True90 91 116 @classmethod 92 117 def _merge_non_test_data(cls, aggregated_json, incremental_json, num_runs): … … 101 126 # Merge this build into aggreagated results. 102 127 cls._merge_one_build(aggregated_json, incremental_json, index, num_runs) 103 104 return True105 128 106 129 @classmethod … … 120 143 @classmethod 121 144 def _merge_tests(cls, aggregated_json, incremental_json, num_runs): 122 all_tests = set(aggregated_json.iterkeys()) | set(incremental_json.iterkeys()) 145 all_tests = set(aggregated_json.iterkeys()) 146 if incremental_json: 147 all_tests |= set(incremental_json.iterkeys()) 148 123 149 for test_name in all_tests: 124 if test_name in aggregated_json:125 aggregated_ test = aggregated_json[test_name]126 if test_name in incremental_json:127 incremental_test = incremental_json[test_name] 128 results = incremental_test[JSON_RESULTS_RESULTS]129 times = incremental_test[JSON_RESULTS_TIMES]130 else:131 results = [[1, JSON_RESULTS_NO_DATA]]132 times = [[1, 0]] 133 134 cls._insert_item_run_length_encoded(results, aggregated_test[JSON_RESULTS_RESULTS], num_runs)135 cls._insert_item_run_length_encoded(times, aggregated_test[JSON_RESULTS_TIMES], num_runs)136 cls._normalize_results_json(test_name, aggregated_json, num_runs)150 if test_name not in aggregated_json: 151 aggregated_json[test_name] = incremental_json[test_name] 152 continue 153 154 if JSON_RESULTS_RESULTS not in aggregated_json[test_name]: 155 incremental_sub_result = incremental_json[test_name] if test_name in incremental_json else None 156 cls._merge_tests(aggregated_json[test_name], incremental_sub_result, num_runs) 157 continue 158 159 if incremental_json and test_name in incremental_json: 160 incremental_test = incremental_json[test_name] 161 results = incremental_test[JSON_RESULTS_RESULTS] 162 times = incremental_test[JSON_RESULTS_TIMES] 137 163 else: 138 aggregated_json[test_name] = incremental_json[test_name] 164 results = [[1, JSON_RESULTS_NO_DATA]] 165 times = [[1, 0]] 166 167 aggregated_test = aggregated_json[test_name] 168 cls._insert_item_run_length_encoded(results, aggregated_test[JSON_RESULTS_RESULTS], num_runs) 169 cls._insert_item_run_length_encoded(times, aggregated_test[JSON_RESULTS_TIMES], num_runs) 170 cls._normalize_results_json(test_name, aggregated_json, num_runs) 139 171 140 172 @classmethod … … 176 208 177 209 @classmethod 178 def _flatten_json_tests(cls, json, prefix=None):179 """Flattens a trie directory structure of tests into a flat structure.180 """181 result = {}182 for name, test in json.iteritems():183 if prefix:184 fullname = prefix + "/" + name185 else:186 fullname = name187 188 if "results" in test:189 result[fullname] = test190 else:191 result.update(cls._flatten_json_tests(test, fullname))192 193 return result194 195 @classmethod196 210 def _remove_gtest_modifiers(cls, builder, json): 197 211 tests = json[builder][JSON_RESULTS_TESTS] 198 212 new_tests = {} 213 # FIXME: This is wrong. If the test exists in the incremental results as both values, then one will overwrite the other. 214 # We should instead pick the one that doesn't have NO_DATA as its value. 215 # Alternately we could fix this by having the JSON generation code on the buildbot only include the test 216 # that was actually run. 199 217 for name, test in tests.iteritems(): 200 218 new_name = name.replace('.FLAKY_', '.', 1) … … 222 240 return False 223 241 224 # FIXME(aboxhall): Once the dashboard can read hierarchical JSON, both 225 # incremental and aggregated JSON can be hierarchical, with no need to 226 # flatten here. 227 if version == JSON_RESULTS_HIERARCHICAL_VERSION: 228 flattened_tests = cls._flatten_json_tests(results_for_builder[JSON_RESULTS_TESTS]) 229 json[builder][JSON_RESULTS_TESTS] = flattened_tests 230 json[JSON_RESULTS_VERSION_KEY] = JSON_RESULTS_VERSION 242 # FIXME: Once all the bots have cycled, we can remove this code since all the results will be heirarchical. 243 if version < JSON_RESULTS_HIERARCHICAL_VERSION: 244 json[builder][JSON_RESULTS_TESTS] = _trie_json_tests(results_for_builder[JSON_RESULTS_TESTS]) 245 json[JSON_RESULTS_VERSION_KEY] = JSON_RESULTS_HIERARCHICAL_VERSION 231 246 232 247 return True … … 261 276 logging.info("Merging json results...") 262 277 try: 263 if not cls._merge_json(aggregated_json[builder], incremental_json[builder], num_runs): 264 return None 278 cls._merge_json(aggregated_json[builder], incremental_json[builder], num_runs) 265 279 except Exception, err: 266 280 logging.error("Failed to merge json results: %s", str(err)) 267 281 return None 268 282 269 aggregated_json[JSON_RESULTS_VERSION_KEY] = JSON_RESULTS_ VERSION283 aggregated_json[JSON_RESULTS_VERSION_KEY] = JSON_RESULTS_HIERARCHICAL_VERSION 270 284 271 285 return cls._generate_file_data(aggregated_json, sort_keys) -
trunk/Tools/TestResultServer/model/jsonresults_unittest.py
r100863 r100875 114 114 json = json.replace("[TESTDATA_TIMES]", ",".join(times)) 115 115 116 if "version" in test_data: 117 json = json.replace("[VERSION]", str(test_data["version"])) 118 else: 119 json = json.replace("[VERSION]", "3") 116 version = str(test_data["version"]) if "version" in test_data else "4" 117 json = json.replace("[VERSION]", version) 120 118 121 119 json_tests = [] … … 557 555 # Aggregated results 558 556 {"builds": ["2", "1"], 559 "tests": {"foo/001.html": { 557 "tests": {"bar/003.html": { 558 "results": "[25,\"F\"]", 559 "times": "[25,0]"}, 560 "foo/001.html": { 560 561 "results": "[50,\"F\"]", 561 562 "times": "[50,0]"}, 562 563 "foo/002.html": { 563 564 "results": "[100,\"I\"]", 564 "times": "[100,0]"}}}, 565 # Incremental results 566 {"builds": ["3"], 567 "tests": {"foo": { 565 "times": "[100,0]"}}, 566 "version": 3}, 567 # Incremental results 568 {"builds": ["3"], 569 "tests": {"baz": { 570 "004.html": { 571 "results": "[1,\"I\"]", 572 "times": "[1,0]"}}, 573 "foo": { 568 574 "001.html": { 569 575 "results": "[1,\"F\"]", … … 575 581 # Expected results 576 582 {"builds": ["3", "2", "1"], 577 "tests": {"foo/001.html": { 578 "results": "[51,\"F\"]", 579 "times": "[51,0]"}, 580 "foo/002.html": { 581 "results": "[101,\"I\"]", 582 "times": "[101,0]"}}, 583 "version": 3}) 583 "tests": {"bar": { 584 "003.html": { 585 "results": "[1,\"N\"],[25,\"F\"]", 586 "times": "[26,0]"}}, 587 "baz": { 588 "004.html": { 589 "results": "[1,\"I\"]", 590 "times": "[1,0]"}}, 591 "foo": { 592 "001.html": { 593 "results": "[51,\"F\"]", 594 "times": "[51,0]"}, 595 "002.html": { 596 "results": "[101,\"I\"]", 597 "times": "[101,0]"}}}, 598 "version": 4}) 584 599 585 600 # FIXME(aboxhall): Add some tests for xhtml/svg test results. … … 613 628 "results": "[100,\"I\"]", 614 629 "times": "[100,0]"}, 615 }}, 630 }, 631 "version": 3}, 616 632 # Incremental results 617 633 {"builds": ["3"], … … 649 665 "results": "[1,\"I\"]", 650 666 "times": "[1,0]"}}, 651 "version": 3})667 "version": 4}) 652 668 653 669 if __name__ == '__main__':
Note: See TracChangeset
for help on using the changeset viewer.
