Changeset 235409 in webkit

Timestamp:

Aug 27, 2018, 4:31:18 PM (7 years ago)

Author:

Simon Fraser

Message:

[LayoutTests] results.html shows "no expected results" for text diff failures
​https://bugs.webkit.org/show_bug.cgi?id=188927

Reviewed by Alexey Proskuryakov.

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:

Location:

trunk/LayoutTests

Files:

• ChangeLog (modified) (1 diff)
• fast/harness/full_results.json (modified) (1 diff)
• fast/harness/results-expected.txt (modified) (1 diff)
• fast/harness/results.html (modified) (7 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+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 Alexey Proskuryakov.
+        
+        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>
 

trunk/LayoutTests/fast/harness/full_results.json

@@ -89 +89 @@
             }
         },
+        "css1": {
+            "font_properties": {
+                "font_family.html": {
+                    "report": "REGRESSION",
+                    "expected": "PASS",
+                    "actual": "TEXT MISSING",
+                    "is_missing_image": true
+                }
+            }
+        },
         "svg": {
             "batik": {

trunk/LayoutTests/fast/harness/results-expected.txt

@@ -10 +10 @@
 +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

trunk/LayoutTests/fast/harness/results.html

@@ -330 +330 @@
     }
     
-    isMissing()
+    isMissingAllResults()
+    {
+        return this.info.actual == 'MISSING';
+    }
+    
+    hasMissingResult()
     {
         return this.info.actual.indexOf('MISSING') != -1;
@@ -400 +405 @@
     }
     
+    isMissingText()
+    {
+        return this.info.is_missing_text;
+    }
+
     isMissingImage()
     {
         return this.info.is_missing_image;
+    }
+
+    isMissingAudio()
+    {
+        return this.info.is_missing_audio;
     }
     
@@ -486 +501 @@
             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);
@@ -1187 +1202 @@
             this.appendAudioFailureLinks(testResult, resultCell);
             
-        if (testResult.isMissing())
+        if (testResult.hasMissingResult())
             this.appendActualOnlyLinks(testResult, resultCell);
 
@@ -1209 +1224 @@
         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);
         }
@@ -1236 +1251 @@
     {
         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');
     }
@@ -1268 +1283 @@
         }
         
-        if (testResult.isMissing() && testResult.isMissingImage())
+        if (testResult.hasMissingResult() && testResult.isMissingImage())
             result += TestResultsController.resultLink(testPrefix, '-actual.png', 'png result');