Modified: trunk/Tools/TestResultServer/model/jsonresults.py (104732 => 104733)
--- trunk/Tools/TestResultServer/model/jsonresults.py 2012-01-11 20:17:13 UTC (rev 104732)
+++ trunk/Tools/TestResultServer/model/jsonresults.py 2012-01-11 20:38:36 UTC (rev 104733)
@@ -233,24 +233,6 @@
return encoded_list
@classmethod
- def _is_results_all_of_type(cls, results, type):
- return len(results) == 1 and results[0][1] == type
-
- @classmethod
- def _remove_gtest_modifiers(cls, builder, json):
- tests = json[builder][JSON_RESULTS_TESTS]
- new_tests = {}
- for name, test in tests.items():
- new_name = name.replace('.FLAKY_', '.', 1)
- new_name = new_name.replace('.FAILS_', '.', 1)
- new_name = new_name.replace('.MAYBE_', '.', 1)
- new_name = new_name.replace('.DISABLED_', '.', 1)
- if new_name not in new_tests or test[JSON_RESULTS_RESULTS][0][1] != JSON_RESULTS_NO_DATA:
- new_tests[new_name] = test
-
- json[builder][JSON_RESULTS_TESTS] = new_tests
-
- @classmethod
def _check_json(cls, builder, json):
version = json[JSON_RESULTS_VERSION_KEY]
if version > JSON_RESULTS_HIERARCHICAL_VERSION:
@@ -289,9 +271,6 @@
if not cls._check_json(builder, incremental_json):
return None
- # FIXME: We should probably avoid doing this for layout tests.
- cls._remove_gtest_modifiers(builder, incremental_json)
-
logging.info("Loading existing aggregated json...")
aggregated_json = cls._load_json(aggregated)
if not aggregated_json:
Modified: trunk/Tools/TestResultServer/model/jsonresults_unittest.py (104732 => 104733)
--- trunk/Tools/TestResultServer/model/jsonresults_unittest.py 2012-01-11 20:17:13 UTC (rev 104732)
+++ trunk/Tools/TestResultServer/model/jsonresults_unittest.py 2012-01-11 20:38:36 UTC (rev 104733)
@@ -655,7 +655,7 @@
# Expected results
{"foo": {"001.html":{}}, "002.html":{}})
- def test_remove_gtest_modifiers(self):
+ def test_gtest(self):
self._test_merge(
# Aggregated results
{"builds": ["2", "1"],
@@ -665,49 +665,30 @@
"foo.bar2": {
"results": [[100,"I"]],
"times": [[100,0]]},
- "foo.FAILS_bar3": {
- "results": [[100,"I"]],
- "times": [[100,0]]},
},
"version": 3},
# Incremental results
{"builds": ["3"],
- "tests": {"foo.DISABLED_bar": {
- "results": [[1,"F"]],
- "times": [[1,0]]},
- "foo.FLAKY_bar2": {
- "results": [[1,"N"]],
- "times": [[1,0]]},
- "foo.bar2": {
+ "tests": {"foo.bar2": {
"results": [[1,"I"]],
"times": [[1,0]]},
"foo.bar3": {
- "results": [[1,"N"]],
+ "results": [[1,"F"]],
"times": [[1,0]]},
- "foo.FAILS_bar3": {
- "results": [[1,"I"]],
- "times": [[1,0]]},
- "foo.MAYBE_bar4": {
- "results": [[1,"I"]],
- "times": [[1,0]]}},
+ },
"version": 4},
# Expected results
{"builds": ["3", "2", "1"],
- "tests": {"foo.FAILS_bar3": {
- "results": [[1,"N"],[100,"I"]],
- "times": [[101,0]]},
- "foo.bar": {
- "results": [[51,"F"]],
+ "tests": {"foo.bar": {
+ "results": [[1, "N"], [50,"F"]],
"times": [[51,0]]},
"foo.bar2": {
"results": [[101,"I"]],
"times": [[101,0]]},
"foo.bar3": {
- "results": [[1,"I"]],
+ "results": [[1,"F"]],
"times": [[1,0]]},
- "foo.bar4": {
- "results": [[1,"I"]],
- "times": [[1,0]]}},
+ },
"version": 4})
if __name__ == '__main__':
