Changeset 85459 in webkit

Timestamp:

May 1, 2011 11:14:56 PM (13 years ago)

Author:

abarth@webkit.org

Message:

2011-05-01 Adam Barth <​abarth@webkit.org>

Reviewed by Eric Seidel.

JSONTestResult needs to handle multiple results
​https://bugs.webkit.org/show_bug.cgi?id=59269

This case occurs when a test is flaky because NRWT will run the test
twice and report both results as "actual."

• Scripts/webkitpy/common/net/resultsjsonparser.py:
• Scripts/webkitpy/common/net/resultsjsonparser_unittest.py:

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/common/net/resultsjsonparser.py (modified) (2 diffs)
• Scripts/webkitpy/common/net/resultsjsonparser_unittest.py (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2011-05-01  Adam Barth  <abarth@webkit.org>
+
+        Reviewed by Eric Seidel.
+
+        JSONTestResult needs to handle multiple results
+        https://bugs.webkit.org/show_bug.cgi?id=59269
+
+        This case occurs when a test is flaky because NRWT will run the test
+        twice and report both results as "actual."
+
+        * Scripts/webkitpy/common/net/resultsjsonparser.py:
+        * Scripts/webkitpy/common/net/resultsjsonparser_unittest.py:
+
 2011-05-01  Adam Barth  <abarth@webkit.org>
 

trunk/Tools/Scripts/webkitpy/common/net/resultsjsonparser.py

@@ -64 +64 @@
 
     def did_pass(self):
-        return self._actual_as_expectation() == test_expectations.PASS
+        return test_expectations.PASS in self._actual_as_expectations()
 
-    def _actual_as_expectation(self):
-        actual_result = self._result_dict['actual']
-        # There should always be only one expectation for actual
-        assert(' ' not in actual_result)
-        return test_expectations.TestExpectations.expectation_from_string(actual_result)
+    def _actual_as_expectations(self):
+        actual_results = self._result_dict['actual']
+        expectations = map(test_expectations.TestExpectations.expectation_from_string, actual_results.split(' '))
+        if None in expectations:
+            log("Unrecognized actual result in %s" % actual_results)
+        return expectations
 
-    def _failures(self):
-        actual = self._actual_as_expectation()
+    def _failure_types_from_actual_result(self, actual):
         # FIXME: There doesn't seem to be a full list of all possible values of
         # 'actual' anywhere.  However JSONLayoutResultsGenerator.FAILURE_TO_CHAR
@@ -96 +96 @@
             log("Failed to handle: %s" % self._result_dict['actual'])
             return []
+
+    def _failures(self):
+        if self.did_pass():
+            return []
+        return sum(map(self._failure_types_from_actual_result, self._actual_as_expectations()), [])
 
     def test_result(self):

trunk/Tools/Scripts/webkitpy/common/net/resultsjsonparser_unittest.py

@@ -43 +43 @@
                     "expected": "PASS",
                     "actual": "TEXT"
+                },
+                "prototype-banana.html": {
+                    "expected": "TEXT",
+                    "actual": "PASS"
+                },
+                "prototype-taco.html": {
+                    "expected": "PASS",
+                    "actual": "PASS TEXT"
+                },
+                "prototype-strawberry.html": {
+                    "expected": "PASS",
+                    "actual": "TEXT PASS"
                 }
             }