Title: [146846] trunk/LayoutTests
- Revision
- 146846
- Author
- [email protected]
- Date
- 2013-03-25 20:19:06 -0700 (Mon, 25 Mar 2013)
Log Message
REGRESSION(r146657): NRWT shouldn't report image only failures when pixel tests are disabled
https://bugs.webkit.org/show_bug.cgi?id=113261
Reviewed by Dirk Pranke.
Fixed the bug by treating ['TEXT', 'IMAGE'] as a flaky pass when the pixel tests is disabled
since the second token implies that we've forced pixel tests in retry and didn't have text failures.
* fast/harness/resources/results-test.js:
* fast/harness/results.html:
* fast/harness/results-expected.txt:
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (146845 => 146846)
--- trunk/LayoutTests/ChangeLog 2013-03-26 03:13:02 UTC (rev 146845)
+++ trunk/LayoutTests/ChangeLog 2013-03-26 03:19:06 UTC (rev 146846)
@@ -1,3 +1,17 @@
+2013-03-25 Ryosuke Niwa <[email protected]>
+
+ REGRESSION(r146657): NRWT shouldn't report image only failures when pixel tests are disabled
+ https://bugs.webkit.org/show_bug.cgi?id=113261
+
+ Reviewed by Dirk Pranke.
+
+ Fixed the bug by treating ['TEXT', 'IMAGE'] as a flaky pass when the pixel tests is disabled
+ since the second token implies that we've forced pixel tests in retry and didn't have text failures.
+
+ * fast/harness/resources/results-test.js:
+ * fast/harness/results.html:
+ * fast/harness/results-expected.txt:
+
2013-03-25 Tony Chang <[email protected]>
Unreviewed, update Efl test expectations to mark new test as failing.
Modified: trunk/LayoutTests/fast/harness/resources/results-test.js (146845 => 146846)
--- trunk/LayoutTests/fast/harness/resources/results-test.js 2013-03-26 03:13:02 UTC (rev 146845)
+++ trunk/LayoutTests/fast/harness/resources/results-test.js 2013-03-26 03:19:06 UTC (rev 146846)
@@ -779,6 +779,14 @@
assertTrue(document.querySelector('tbody td:nth-child(3) a').getAttribute('href') == 'retries/foo/bar-image-diffs.html');
});
+ results = mockResults();
+ results.tests['foo/bar-image.html'] = mockExpectation('PASS', 'TEXT IMAGE');
+ results.pixel_tests_enabled = false;
+ runTest(results, function() {
+ assertTrue(!document.getElementById('results-table'));
+ assertTrue(document.querySelector('#flaky-tests-table td:nth-child(3) a').getAttribute('href') == 'retries/foo/bar-image-diffs.html');
+ });
+
document.body.innerHTML = '<pre>' + g_log.join('\n') + '</pre>';
}
Modified: trunk/LayoutTests/fast/harness/results-expected.txt (146845 => 146846)
--- trunk/LayoutTests/fast/harness/results-expected.txt 2013-03-26 03:13:02 UTC (rev 146845)
+++ trunk/LayoutTests/fast/harness/results-expected.txt 2013-03-26 03:19:06 UTC (rev 146846)
@@ -252,3 +252,5 @@
TEST-45: PASS
TEST-45: PASS
TEST-46: PASS
+TEST-47: PASS
+TEST-47: PASS
Modified: trunk/LayoutTests/fast/harness/results.html (146845 => 146846)
--- trunk/LayoutTests/fast/harness/results.html 2013-03-26 03:13:02 UTC (rev 146845)
+++ trunk/LayoutTests/fast/harness/results.html 2013-03-26 03:19:06 UTC (rev 146846)
@@ -506,7 +506,9 @@
return;
}
- if (actual.indexOf(' ') != -1 && actual.indexOf('PASS') != -1) {
+ var actualTokens = actual.split(' ');
+ var passedWithImageOnlyFailureInRetry = actualTokens[0] == 'TEXT' && actualTokens[1] == 'IMAGE';
+ if (actualTokens[1] && actual.indexOf('PASS') != -1 || (!globalState().results.pixel_tests_enabled && passedWithImageOnlyFailureInRetry)) {
globalState().flakyPassTests.push(testObject);
return;
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
