Attachment 349186 Details for Bug 189430 – Patch

[patch] Patch

bug-189430-20180907135221.patch (text/plain), 4.74 KB, created by Simon Fraser (smfr) on 2018-09-07 13:52:22 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Simon Fraser (smfr)

Created: 2018-09-07 13:52:22 PDT

Size: 4.74 KB

patch

obsolete

>Subversion Revision: 235791
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index f32b77fd07fcc5664fbae70c693faf4447f894e1..31ed281852a73a2aea6e751078e484d56e2e3145 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,19 @@
>+2018-09-07  Simon Fraser  <simon.fraser@apple.com>
>+
>+        resultsjsonparser needs to handle leak failures
>+        https://bugs.webkit.org/show_bug.cgi?id=189430
>+
>+        Reviewed by NOBODY (OOPS!).
>+        
>+        Teach resultsjsonparser how to handle LEAK failures, building a FailureDocumentLeak
>+        with a list of the leaked URLs.
>+
>+        * Scripts/webkitpy/common/net/resultsjsonparser.py:
>+        (JSONTestResult._failure_types_from_actual_result):
>+        * Scripts/webkitpy/common/net/resultsjsonparser_unittest.py:
>+        (ParsedJSONResultsTest):
>+        (test_basic):
>+
> 2018-09-07  Aakash Jain  <aakash_jain@apple.com>
> 
>         [ews-build] API tests should output result summary in json
>diff --git a/Tools/Scripts/webkitpy/common/net/resultsjsonparser.py b/Tools/Scripts/webkitpy/common/net/resultsjsonparser.py
>index 6888a454d6366821402f46ceaeadf82879fc750a..32b22c903077bc76a51bde82bc4657e0f32ea1ea 100644
>--- a/Tools/Scripts/webkitpy/common/net/resultsjsonparser.py
>+++ b/Tools/Scripts/webkitpy/common/net/resultsjsonparser.py
>@@ -121,6 +121,11 @@ class JSONTestResult(object):
>         elif actual == test_expectations.CRASH:
>             # NOTE: We don't know what process crashed from the json, just that a process crashed.
>             return [test_failures.FailureCrash()]
>+        elif actual == test_expectations.LEAK:
>+            urls = []
>+            for url_dict in self._result_dict['leaks']:
>+                urls.append(url_dict['document'])
>+            return [test_failures.FailureDocumentLeak(urls)]
>         elif actual == test_expectations.MISSING:
>             return [test_failures.FailureMissingResult(), test_failures.FailureMissingImageHash(), test_failures.FailureMissingImage()]
>         else:
>diff --git a/Tools/Scripts/webkitpy/common/net/resultsjsonparser_unittest.py b/Tools/Scripts/webkitpy/common/net/resultsjsonparser_unittest.py
>index 67a2ef6a5cf4b27c70f23051cf622ba329b09f49..5c767d4f70972b11852e148b98a97d2388337bdd 100644
>--- a/Tools/Scripts/webkitpy/common/net/resultsjsonparser_unittest.py
>+++ b/Tools/Scripts/webkitpy/common/net/resultsjsonparser_unittest.py
>@@ -58,13 +58,12 @@ class ParsedJSONResultsTest(unittest.TestCase):
>                 },
>                 "prototype-strawberry.html": {
>                     "expected": "PASS",
>-                    "actual": "FAIL PASS",
>-                    "leaks": {
>-                        "documents": [
>-                            "file:///Volumes/Data/slave/webkit/build/LayoutTests/fast/dom/prototype-strawberry.html",
>-                            "about:blank"
>-                        ]
>-                    }
>+                    "actual": "LEAK",
>+                    "leaks": [
>+                        {
>+                            "document": "file:///Volumes/Data/slave/webkit/build/LayoutTests/fast/dom/prototype-strawberry.html"
>+                        }
>+                    ]
>                 }
>             }
>         },
>@@ -112,13 +111,12 @@ class ParsedJSONResultsTest(unittest.TestCase):
>                 },
>                 "prototype-strawberry.html": {
>                     "expected": "PASS",
>-                    "actual": "FAIL PASS",
>-                    "leaks": {
>-                        "documents": [
>-                            "file:///Volumes/Data/slave/webkit/build/LayoutTests/fast/dom/prototype-strawberry.html",
>-                            "about:blank"
>-                        ]
>-                    }
>+                    "actual": "LEAK",
>+                    "leaks": [
>+                        {
>+                            "document": "file:///Volumes/Data/slave/webkit/build/LayoutTests/fast/dom/prototype-strawberry.html"
>+                        }
>+                    ]
>                 }
>             }
>         },
>@@ -148,6 +146,7 @@ class ParsedJSONResultsTest(unittest.TestCase):
>         expected_results = [
>             test_results.TestResult("svg/dynamic-updates/SVGFEDropShadowElement-dom-stdDeviation-attr.html", [test_failures.FailureImageHashMismatch()], 0),
>             test_results.TestResult("fast/dom/prototype-inheritance.html", [test_failures.FailureTextMismatch(), test_failures.FailureImageHashMismatch(), test_failures.FailureAudioMismatch()], 0),
>+            test_results.TestResult("fast/dom/prototype-strawberry.html", [test_failures.FailureDocumentLeak(['file:///Volumes/Data/slave/webkit/build/LayoutTests/fast/dom/prototype-strawberry.html'])], 0),
>         ]
>         parsed_results = ParsedJSONResults(self._example_full_results_json)
>         self.assertEqual(expected_results, parsed_results.test_results())

Flags:

ap: review+

Actions: View | Formatted Diff | Diff

Attachments on bug 189430: 349186