Attachment 348219 Details for Bug 188927 – Patch

[patch] Patch

bug-188927-20180827153835.patch (text/plain), 5.83 KB, created by Simon Fraser (smfr) on 2018-08-27 15:38:35 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Simon Fraser (smfr)

Created: 2018-08-27 15:38:35 PDT

Size: 5.83 KB

patch

obsolete

>Subversion Revision: 235399
>diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
>index cc4adee92b9903207db44ab7ff064d17108742a0..099a0bc88afdf3a13dc4ead1f4d315af8d5ed234 100644
>--- a/LayoutTests/ChangeLog
>+++ b/LayoutTests/ChangeLog
>@@ -1,3 +1,19 @@
>+2018-08-27  Simon Fraser  <simon.fraser@apple.com>
>+
>+        [LayoutTests] results.html shows "no expected results" for text diff failures
>+        https://bugs.webkit.org/show_bug.cgi?id=188927
>+
>+        Reviewed by NOBODY (OOPS!).
>+        
>+        The results.html rewrite confused "is missing all results" with "is missing one type of result",
>+        causing tests with a missing image to show as tests with no results.
>+        
>+        Fix by clarifying the types of "missing".
>+
>+        * fast/harness/full_results.json:
>+        * fast/harness/results-expected.txt:
>+        * fast/harness/results.html:
>+
> 2018-08-27  Andy Estes  <aestes@apple.com>
> 
>         [Payment Request] Update payment-request web platform tests
>diff --git a/LayoutTests/fast/harness/full_results.json b/LayoutTests/fast/harness/full_results.json
>index f446d93a4f6304981e589082705bff31684bcab8..3e85d2a00c3ddbf69b6caef132adbd53fd95206b 100644
>--- a/LayoutTests/fast/harness/full_results.json
>+++ b/LayoutTests/fast/harness/full_results.json
>@@ -88,6 +88,16 @@ ADD_RESULTS({
>                 }
>             }
>         },
>+        "css1": {
>+            "font_properties": {
>+                "font_family.html": {
>+                    "report": "REGRESSION",
>+                    "expected": "PASS",
>+                    "actual": "TEXT MISSING",
>+                    "is_missing_image": true
>+                }
>+            }
>+        },
>         "svg": {
>             "batik": {
>                 "smallFonts.svg": {
>diff --git a/LayoutTests/fast/harness/results-expected.txt b/LayoutTests/fast/harness/results-expected.txt
>index 798066443506c6928172bfbd2be464a44d53fe50..bd82d3d96d4a690bc2e0d877c500e48e271e7fb2 100644
>--- a/LayoutTests/fast/harness/results-expected.txt
>+++ b/LayoutTests/fast/harness/results-expected.txt
>@@ -9,9 +9,10 @@ Other crashes (2): flag all
> 
> +DumpRenderTree-54888	crash log
> +DumpRenderTree-56804	crash log
>-Tests that failed text/pixel/audio diff (2): flag all
>+Tests that failed text/pixel/audio diff (3): flag all
> 
>  test 	results		actual failure	expected failure	history
>++css1/font_properties/font_family.html	expected actual diff pretty diff	images	text missing		history
> +http/tests/storageAccess/request-storage-access-top-frame.html	expected actual diff pretty diff		text	pass timeout	history
> +http/wpt/cache-storage/cache-put-keys.https.any.worker.html	expected actual diff pretty diff		text	pass	history
> Tests that had no expected results (probably new) (1): flag all
>diff --git a/LayoutTests/fast/harness/results.html b/LayoutTests/fast/harness/results.html
>index f1342be6698f2df08811429257dbcd21abb7c741..81709e0fcf876c10a947023212f27d695c9d3ebf 100644
>--- a/LayoutTests/fast/harness/results.html
>+++ b/LayoutTests/fast/harness/results.html
>@@ -329,7 +329,12 @@ class TestResult
>         return true;
>     }
>     
>-    isMissing()
>+    isMissingAllResults()
>+    {
>+        return this.info.actual == 'MISSING';
>+    }
>+    
>+    hasMissingResult()
>     {
>         return this.info.actual.indexOf('MISSING') != -1;
>     }
>@@ -399,10 +404,20 @@ class TestResult
>         return this.isRefTest() && this.info.reftest_type.indexOf('==') != -1;
>     }
>     
>+    isMissingText()
>+    {
>+        return this.info.is_missing_text;
>+    }
>+
>     isMissingImage()
>     {
>         return this.info.is_missing_image;
>     }
>+
>+    isMissingAudio()
>+    {
>+        return this.info.is_missing_audio;
>+    }
>     
>     hasStdErr()
>     {
>@@ -485,7 +500,7 @@ class TestResults
>         if (testResult.isImageFailure())
>             this.hasImageFailures = true;
> 
>-        if (testResult.isMissing()) {
>+        if (testResult.isMissingAllResults()) {
>             // FIXME: make sure that new-run-webkit-tests spits out an -actual.txt file for tests with MISSING results.
>             this.missingResults.push(testResult);
>             return;
>@@ -1186,7 +1201,7 @@ class FailuresSectionBuilder extends SectionBuilder {
>         if (testResult.isAudioFailure())
>             this.appendAudioFailureLinks(testResult, resultCell);
>             
>-        if (testResult.isMissing())
>+        if (testResult.hasMissingResult())
>             this.appendActualOnlyLinks(testResult, resultCell);
> 
>         let actualTokens = testResult.info.actual.split(/\s+/);
>@@ -1208,7 +1223,7 @@ class FailuresSectionBuilder extends SectionBuilder {
> 
>         if (this._resultsController.testResults.usesExpectationsFile()) {
>             let expectedCell = document.createElement('td');
>-            expectedCell.textContent = testResult.isMissing() ? '' : testResult.info.expected;
>+            expectedCell.textContent = testResult.hasMissingResult() ? '' : testResult.info.expected;
>             row.appendChild(expectedCell);
>         }
> 
>@@ -1235,10 +1250,10 @@ class FailuresSectionBuilder extends SectionBuilder {
>     appendActualOnlyLinks(testResult, cell)
>     {
>         let prefix = Utils.stripExtension(testResult.name);
>-        if (testResult.info.is_missing_audio)
>+        if (testResult.isMissingAudio())
>             cell.innerHTML += TestResultsController.resultLink(prefix, '-actual.wav', 'audio result');
> 
>-        if (testResult.info.is_missing_text)
>+        if (testResult.isMissingText())
>             cell.innerHTML += TestResultsController.resultLink(prefix, '-actual.txt', 'result');
>     }
> 
>@@ -1267,7 +1282,7 @@ class FailuresSectionBuilder extends SectionBuilder {
>             }
>         }
>         
>-        if (testResult.isMissing() && testResult.isMissingImage())
>+        if (testResult.hasMissingResult() && testResult.isMissingImage())
>             result += TestResultsController.resultLink(testPrefix, '-actual.png', 'png result');
>         
>         return result;

Flags:

ap: review+

Actions: View | Formatted Diff | Diff

Attachments on bug 188927: 348219