Changeset 65080 in webkit

Timestamp:

Aug 10, 2010 11:39:21 AM (14 years ago)

Author:

victorw@chromium.org

Message:

2010-08-10 Victor Wang <​victorw@chromium.org>

Reviewed by Ojan Vafai.

Update test results server merge logic so the aggregated
results and times are updated for tests that are
in aggragated json but not in incremental json.

Also update unittest to test this case.

​https://bugs.webkit.org/show_bug.cgi?id=43769

• TestResultServer/model/jsonresults.py:
• TestResultServer/model/jsonresults_unittest.py:

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• TestResultServer/model/jsonresults.py (modified) (2 diffs)
• TestResultServer/model/jsonresults_unittest.py (modified) (1 diff)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-08-10  Victor Wang  <victorw@chromium.org>
+
+        Reviewed by Ojan Vafai.
+
+        Update test results server merge logic so the aggregated
+        results and times are updated for tests that are
+        in aggragated json but not in incremental json.
+
+        Also update unittest to test this case.
+
+        https://bugs.webkit.org/show_bug.cgi?id=43769
+
+        * TestResultServer/model/jsonresults.py:
+        * TestResultServer/model/jsonresults_unittest.py:
+
 2010-08-09  Antonio Gomes  <tonikitoo@webkit.org>
 

trunk/WebKitTools/TestResultServer/model/jsonresults.py

@@ -172 +172 @@
             # Merge this build into aggreagated results.
             cls._merge_one_build(aggregated_json, incremental_json, index)
-            logging.debug("Merged build %s, merged json: %s.",
-                build_number, aggregated_json)
 
         return True
@@ -211 +209 @@
         """
 
-        for test_name in incremental_json:
-            incremental_test = incremental_json[test_name]
+        all_tests = (set(aggregated_json.iterkeys()) |
+                     set(incremental_json.iterkeys()))
+        for test_name in all_tests:
             if test_name in aggregated_json:
                 aggregated_test = aggregated_json[test_name]
+                if test_name in incremental_json:
+                    incremental_test = incremental_json[test_name]
+                    results = incremental_test[JSON_RESULTS_RESULTS]
+                    times = incremental_test[JSON_RESULTS_TIMES]
+                else:
+                    results = [[1, "P"]]
+                    times = [[1, "0"]]
+
                 cls._insert_item_run_length_encoded(
-                    incremental_test[JSON_RESULTS_RESULTS],
-                    aggregated_test[JSON_RESULTS_RESULTS])
+                    results, aggregated_test[JSON_RESULTS_RESULTS])
                 cls._insert_item_run_length_encoded(
-                    incremental_test[JSON_RESULTS_TIMES],
-                    aggregated_test[JSON_RESULTS_TIMES])
+                    times, aggregated_test[JSON_RESULTS_TIMES])
             else:
-                aggregated_json[test_name] = incremental_test
+                aggregated_json[test_name] = incremental_json[test_name]
 
     @classmethod

trunk/WebKitTools/TestResultServer/model/jsonresults_unittest.py

@@ -207 +207 @@
         self._test_merge(
             # Aggregated results
-            (["2", "1"], [["001.html", "[200,\"P\"]", "[200,\"0\"]"], ["002.html", "[100,\"I\"]", "[100,\"1\"]"]]),
+            (["2", "1"], [["001.html", "[200,\"P\"]", "[200,\"0\"]"], ["002.html", "[100,\"I\"]", "[100,\"1\"]"], ["003.html", "[10,\"F\"]", "[10,\"0\"]"]]),
             # Incremental results
             (["3"], [["002.html", "[1,\"I\"]", "[1,\"1\"]"]]),
             # Expected results
-            (["3", "2", "1"], [["001.html", "[200,\"P\"]", "[200,\"0\"]"], ["002.html", "[101,\"I\"]", "[101,\"1\"]"]]))
+            (["3", "2", "1"], [["001.html", "[201,\"P\"]", "[201,\"0\"]"], ["002.html", "[101,\"I\"]", "[101,\"1\"]"], ["003.html", "[1,\"P\"],[10,\"F\"]", "[11,\"0\"]"]]))
 
         # Single test for multiple runs.