Title: [235409] trunk/LayoutTests
- Revision
- 235409
- Author
- [email protected]
- Date
- 2018-08-27 16:31:18 -0700 (Mon, 27 Aug 2018)
Log 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:
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (235408 => 235409)
--- trunk/LayoutTests/ChangeLog 2018-08-27 23:31:15 UTC (rev 235408)
+++ trunk/LayoutTests/ChangeLog 2018-08-27 23:31:18 UTC (rev 235409)
@@ -1,3 +1,19 @@
+2018-08-27 Simon Fraser <[email protected]>
+
+ [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 <[email protected]>
[Payment Request] Update payment-request web platform tests
Modified: trunk/LayoutTests/fast/harness/full_results.json (235408 => 235409)
--- trunk/LayoutTests/fast/harness/full_results.json 2018-08-27 23:31:15 UTC (rev 235408)
+++ trunk/LayoutTests/fast/harness/full_results.json 2018-08-27 23:31:18 UTC (rev 235409)
@@ -88,6 +88,16 @@
}
}
},
+ "css1": {
+ "font_properties": {
+ "font_family.html": {
+ "report": "REGRESSION",
+ "expected": "PASS",
+ "actual": "TEXT MISSING",
+ "is_missing_image": true
+ }
+ }
+ },
"svg": {
"batik": {
"smallFonts.svg": {
Modified: trunk/LayoutTests/fast/harness/results-expected.txt (235408 => 235409)
--- trunk/LayoutTests/fast/harness/results-expected.txt 2018-08-27 23:31:15 UTC (rev 235408)
+++ trunk/LayoutTests/fast/harness/results-expected.txt 2018-08-27 23:31:18 UTC (rev 235409)
@@ -9,9 +9,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
Tests that had no expected results (probably new) (1): flag all
Modified: trunk/LayoutTests/fast/harness/results.html (235408 => 235409)
--- trunk/LayoutTests/fast/harness/results.html 2018-08-27 23:31:15 UTC (rev 235408)
+++ trunk/LayoutTests/fast/harness/results.html 2018-08-27 23:31:18 UTC (rev 235409)
@@ -329,8 +329,13 @@
return true;
}
- isMissing()
+ isMissingAllResults()
{
+ return this.info.actual == 'MISSING';
+ }
+
+ hasMissingResult()
+ {
return this.info.actual.indexOf('MISSING') != -1;
}
@@ -399,10 +404,20 @@
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 @@
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 @@
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 @@
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 @@
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 @@
}
}
- if (testResult.isMissing() && testResult.isMissingImage())
+ if (testResult.hasMissingResult() && testResult.isMissingImage())
result += TestResultsController.resultLink(testPrefix, '-actual.png', 'png result');
return result;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
