Commit 88e7d612 authored by rniwa@webkit.org's avatar rniwa@webkit.org

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:


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@146846 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent e31bb698
2013-03-25 Ryosuke Niwa <rniwa@webkit.org>
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 <tony@chromium.org>
Unreviewed, update Efl test expectations to mark new test as failing.
......@@ -779,6 +779,14 @@ function runTests()
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>';
}
......
......@@ -252,3 +252,5 @@ TEST-45: PASS
TEST-45: PASS
TEST-45: PASS
TEST-46: PASS
TEST-47: PASS
TEST-47: PASS
......@@ -506,7 +506,9 @@ function processGlobalStateFor(testObject)
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;
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment