Changeset 99783 in webkit

Timestamp:

Nov 9, 2011, 4:49:03 PM (15 years ago)

Author:

ojan@chromium.org

Message:

Merge in results to the test results server even if build numbers conflict
​https://bugs.webkit.org/show_bug.cgi?id=71967

Reviewed by Tony Chang.

This was initially meant to be a sanity check that we don't
enter duplicate runs, but it turns out that we can reasonably get
in these situations when a builder is clobbered (e.g. the build
numbers start over again from 0).

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

Location:

trunk/Tools

Files:

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

trunk/Tools/ChangeLog

@@ +1 @@
+2011-11-09  Ojan Vafai  <ojan@chromium.org>
+
+        Merge in results to the test results server even if build numbers conflict
+        https://bugs.webkit.org/show_bug.cgi?id=71967
+
+        Reviewed by Tony Chang.
+
+        This was initially meant to be a sanity check that we don't
+        enter duplicate runs, but it turns out that we can reasonably get
+        in these situations when a builder is clobbered (e.g. the build
+        numbers start over again from 0).
+
+        * TestResultServer/model/jsonresults.py:
+        * TestResultServer/model/jsonresults_unittest.py:
+
 2011-11-09  Eric Seidel  <eric@webkit.org>
 

trunk/Tools/TestResultServer/model/jsonresults.py

@@ -100 +100 @@
             logging.debug("Merging build %s, incremental json index: %d.", build_number, index)
 
-            # FIXME: make this case work.
-            if build_number < aggregated_build_number:
-                logging.warning("Build %d in incremental json is older than the most recent build in aggregated results: %d",
-                    build_number, aggregated_build_number)
-                return False
-
-            # FIXME: skip the duplicated build and merge rest of the results.
-            # Need to be careful on skiping the corresponding value in
-            # _merge_tests because the property data for each test could be accumulated.
-            if build_number == aggregated_build_number:
-                logging.warning("Duplicate build %d in incremental json", build_number)
-                return False
-
             # Merge this build into aggreagated results.
             cls._merge_one_build(aggregated_json, incremental_json, index, num_runs)

trunk/Tools/TestResultServer/model/jsonresults_unittest.py

@@ -374 +374 @@
         # Test the build in incremental results is older than the most recent
         # build in aggregated results.
-        # The incremental results should be dropped and no merge happens.
         self._test_merge(
             # Aggregated results
             {"builds": ["3", "1"],
              "tests": {"001.html": {
-                           "results": "[200,\"F\"]",
-                           "times": "[200,0]"}}},
+                           "results": "[5,\"F\"]",
+                           "times": "[5,0]"}}},
             # Incremental results
             {"builds": ["2"],
@@ -387 +386 @@
                            "times": "[1,0]"}}},
             # Expected no merge happens.
-            None)
+            {"builds": ["2", "3", "1"],
+             "tests": {"001.html": {
+                           "results": "[6,\"F\"]",
+                           "times": "[6,0]"}}})
 
     def test_merge_incremental_result_same_build(self):
         # Test the build in incremental results is same as the build in
         # aggregated results.
-        # The incremental results should be dropped and no merge happens.
-        self._test_merge(
-            # Aggregated results
-            {"builds": ["2", "1"],
-             "tests": {"001.html": {
-                           "results": "[200,\"F\"]",
-                           "times": "[200,0]"}}},
+        self._test_merge(
+            # Aggregated results
+            {"builds": ["2", "1"],
+             "tests": {"001.html": {
+                           "results": "[5,\"F\"]",
+                           "times": "[5,0]"}}},
             # Incremental results
             {"builds": ["3", "2"],
@@ -405 +406 @@
                            "times": "[2,0]"}}},
             # Expected no merge happens.
-            None)
+            {"builds": ["3", "2", "2", "1"],
+             "tests": {"001.html": {
+                           "results": "[7,\"F\"]",
+                           "times": "[7,0]"}}})
 
     def test_merge_remove_test_with_no_data(self):