Diff
Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/controllers/rebaseline.js (111227 => 111228)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/controllers/rebaseline.js 2012-03-19 20:19:46 UTC (rev 111227)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/controllers/rebaseline.js 2012-03-19 20:23:12 UTC (rev 111228)
@@ -31,7 +31,7 @@
fetchResultsURLs: results.fetchResultsURLs
});
- var failuresByTest = results.expectedOrUnexpectedFailuresByTest(model.state.resultsByBuilder);
+ var failuresByTest = results.expectedFailuresByTest(model.state.resultsByBuilder);
var controller = new controllers.ResultsDetails(resultsView, failuresByTest);
document.body.appendChild(resultsView);
});
Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/controllers.js (111227 => 111228)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/controllers.js 2012-03-19 20:19:46 UTC (rev 111227)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/controllers.js 2012-03-19 20:23:12 UTC (rev 111228)
@@ -104,8 +104,8 @@
},
update: function()
{
- var expectedOrUnexpectedFailures = results.expectedOrUnexpectedFailuresByTest(this._model.resultsByBuilder);
- var failingTestsList = Object.keys(expectedOrUnexpectedFailures);
+ var expectedFailures = results.expectedFailuresByTest(this._model.resultsByBuilder);
+ var failingTestsList = Object.keys(expectedFailures);
$(this._view).empty();
base.forEachDirectory(failingTestsList, function(label, testsFailingInDirectory) {
@@ -122,7 +122,7 @@
fetchResultsURLs: results.fetchResultsURLs
});
var failuresByTest = base.filterDictionary(
- results.expectedOrUnexpectedFailuresByTest(this._model.resultsByBuilder),
+ results.expectedFailuresByTest(this._model.resultsByBuilder),
function(key) {
return failingTestsList.indexOf(key) != -1;
});
@@ -256,7 +256,7 @@
});
controllers.Failures = base.extends(FailureStreamController, {
- _resultsFilter: results.expectedOrUnexpectedFailuresByTest,
+ _resultsFilter: results.expectedFailuresByTest,
_keyFor: function(failureAnalysis)
{
Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/garden-o-matic.js (111227 => 111228)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/garden-o-matic.js 2012-03-19 20:19:46 UTC (rev 111227)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/garden-o-matic.js 2012-03-19 20:23:12 UTC (rev 111228)
@@ -108,11 +108,11 @@
unexpected.appendChild(g_info);
unexpected.appendChild(unexpectedFailuresView);
- var failures = onebar.failures();
- if (failures) {
+ var expected = onebar.expected();
+ if (expected) {
var failuresView = new ui.failures.List();
g_failuresController = new controllers.ExpectedFailures(model.state, failuresView, onebarController);
- failures.appendChild(failuresView);
+ expected.appendChild(failuresView);
}
update();
Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/model.js (111227 => 111228)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/model.js 2012-03-19 20:19:46 UTC (rev 111227)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/model.js 2012-03-19 20:23:12 UTC (rev 111228)
@@ -220,9 +220,9 @@
});
};
-model.analyzeExpectedOrUnexpectedFailures = function(callback)
+model.analyzeexpectedFailures = function(callback)
{
- var expectedFailures = results.expectedOrUnexpectedFailuresByTest(model.state.resultsByBuilder);
+ var expectedFailures = results.expectedFailuresByTest(model.state.resultsByBuilder);
$.each(expectedFailures, function(testName, resultNodesByBuilder) {
var failureAnalysis = {
'testName': testName,
Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/results.js (111227 => 111228)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/results.js 2012-03-19 20:19:46 UTC (rev 111227)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/results.js 2012-03-19 20:23:12 UTC (rev 111228)
@@ -255,6 +255,12 @@
}
})
+function isExpectedFailure(resultNode)
+{
+ var analyzer = new results.ResultAnalyzer(resultNode);
+ return !analyzer.hasUnexpectedFailures() && !analyzer.succeeded() && !analyzer.flaky();
+}
+
function isUnexpectedFailure(resultNode)
{
var analyzer = new results.ResultAnalyzer(resultNode);
@@ -266,11 +272,9 @@
return !!node.actual;
}
-results.expectedOrUnexpectedFailures = function(resultsTree)
+results.expectedFailures = function(resultsTree)
{
- return base.filterTree(resultsTree.tests, isResultNode, function(resultNode) {
- return !(new results.ResultAnalyzer(resultNode).succeeded());
- });
+ return base.filterTree(resultsTree.tests, isResultNode, isExpectedFailure);
};
results.unexpectedFailures = function(resultsTree)
@@ -300,9 +304,9 @@
return resultsByTest;
}
-results.expectedOrUnexpectedFailuresByTest = function(resultsByBuilder)
+results.expectedFailuresByTest = function(resultsByBuilder)
{
- return resultsByTest(resultsByBuilder, results.expectedOrUnexpectedFailures);
+ return resultsByTest(resultsByBuilder, results.expectedFailures);
};
results.unexpectedFailuresByTest = function(resultsByBuilder)
Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/results_unittests.js (111227 => 111228)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/results_unittests.js 2012-03-19 20:19:46 UTC (rev 111227)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/results_unittests.js 2012-03-19 20:23:12 UTC (rev 111228)
@@ -127,6 +127,20 @@
ok(!analyzer.flaky());
});
+test("expectedFailures", 1, function() {
+ var expectedFailures = results.expectedFailures(unittest.kExampleResultsJSON);
+ deepEqual(expectedFailures, {
+ "scrollbars/custom-scrollbar-with-incomplete-style.html": {
+ "expected": "IMAGE",
+ "actual": "IMAGE"
+ },
+ "userscripts/user-script-video-document.html": {
+ "expected": "FAIL",
+ "actual": "TEXT"
+ }
+ });
+});
+
test("unexpectedFailures", 1, function() {
var unexpectedFailures = results.unexpectedFailures(unittest.kExampleResultsJSON);
deepEqual(unexpectedFailures, {
Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/ui/failures_unittests.js (111227 => 111228)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/ui/failures_unittests.js 2012-03-19 20:19:46 UTC (rev 111227)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/ui/failures_unittests.js 2012-03-19 20:23:12 UTC (rev 111228)
@@ -85,14 +85,14 @@
raises(function() {
grid.update({'Atari': {}})
});
- grid.update({'Webkit Linux (dbg)(1)': { actual: 'TEXT'}});
+ grid.update({'Webkit Linux (dbg)': { actual: 'TEXT'}});
equal(grid.outerHTML, '<table class="failures">' +
'<thead><tr><td>type</td><td>release</td><td>debug</td></tr></thead>' +
'<tbody>' +
'<tr class="TEXT">' +
'<td><span>TEXT</span></td>' +
'<td></td>' +
- '<td><a class="failing-builder" target="_blank" href="" class="version">lucid</span><span class="architecture">64-bit</span></a></td>' +
+ '<td><a class="failing-builder" target="_blank" href="" class="version">lucid</span><span class="architecture">64-bit</span></a></td>' +
'</tr>' +
'<tr class="BUILDING" style="display: none; "><td><span>BUILDING</span></td><td></td><td></td></tr>' +
'</tbody>' +
@@ -109,7 +109,7 @@
'<tr class="TEXT">' +
'<td><span>TEXT</span></td>' +
'<td></td>' +
- '<td><a class="failing-builder" target="_blank" href="" class="version">lucid</span><span class="architecture">64-bit</span></a></td>' +
+ '<td><a class="failing-builder" target="_blank" href="" class="version">lucid</span><span class="architecture">64-bit</span></a></td>' +
'</tr>' +
'<tr class="BUILDING" style="display: none; "><td><span>BUILDING</span></td><td></td><td></td></tr>' +
'</tbody>' +
@@ -126,20 +126,20 @@
'<tr class="TEXT">' +
'<td><span>TEXT</span></td>' +
'<td></td>' +
- '<td><a class="failing-builder" target="_blank" href="" class="version">lucid</span><span class="architecture">64-bit</span></a></td>' +
+ '<td><a class="failing-builder" target="_blank" href="" class="version">lucid</span><span class="architecture">64-bit</span></a></td>' +
'</tr>' +
'<tr class="BUILDING" style="display: none; "><td><span>BUILDING</span></td><td></td><td></td></tr>' +
'</tbody>' +
'</table>');
grid.purge();
- grid.update({'Webkit Linux (dbg)(1)': { actual: 'TEXT'}});
+ grid.update({'Webkit Linux (dbg)': { actual: 'TEXT'}});
equal(grid.outerHTML, '<table class="failures">' +
'<thead><tr><td>type</td><td>release</td><td>debug</td></tr></thead>' +
'<tbody>' +
'<tr class="TEXT">' +
'<td><span>TEXT</span></td>' +
'<td></td>' +
- '<td><a class="failing-builder" target="_blank" href="" class="version">lucid</span><span class="architecture">64-bit</span></a></td>' +
+ '<td><a class="failing-builder" target="_blank" href="" class="version">lucid</span><span class="architecture">64-bit</span></a></td>' +
'</tr>' +
'<tr class="BUILDING" style="display: none; "><td><span>BUILDING</span></td><td></td><td></td></tr>' +
'</tbody>' +
Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/ui/notifications_unittests.js (111227 => 111228)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/ui/notifications_unittests.js 2012-03-19 20:19:46 UTC (rev 111227)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/ui/notifications_unittests.js 2012-03-19 20:23:12 UTC (rev 111228)
@@ -199,7 +199,7 @@
'</ul>' +
'</div>');
- testFailures.addFailureAnalysis({testName: 'foo', resultNodesByBuilder: {'Webkit Linux (dbg)(1)': { actual: 'TEXT'}}});
+ testFailures.addFailureAnalysis({testName: 'foo', resultNodesByBuilder: {'Webkit Linux (dbg)': { actual: 'TEXT'}}});
equal(testFailures.innerHTML,
'<div class="how">' +
'<time class="relative">10 minutes ago</time>' +
@@ -209,7 +209,7 @@
'<tr class="TEXT">' +
'<td><span>TEXT</span></td>' +
'<td></td>' +
- '<td><a class="failing-builder" target="_blank" href="" class="version">lucid</span><span class="architecture">64-bit</span></a></td>' +
+ '<td><a class="failing-builder" target="_blank" href="" class="version">lucid</span><span class="architecture">64-bit</span></a></td>' +
'</tr>' +
'<tr class="BUILDING" style="display: none; "><td><span>BUILDING</span></td><td></td><td></td></tr>' +
'</tbody>' +
@@ -250,7 +250,7 @@
'<tr class="TEXT">' +
'<td><span>TEXT</span></td>' +
'<td></td>' +
- '<td><a class="failing-builder" target="_blank" href="" class="version">lucid</span><span class="architecture">64-bit</span></a></td>' +
+ '<td><a class="failing-builder" target="_blank" href="" class="version">lucid</span><span class="architecture">64-bit</span></a></td>' +
'</tr>' +
'<tr class="BUILDING" style="">' +
'<td><span>BUILDING</span></td>' +
Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/ui.js (111227 => 111228)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/ui.js 2012-03-19 20:19:46 UTC (rev 111227)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/ui.js 2012-03-19 20:23:12 UTC (rev 111228)
@@ -64,15 +64,15 @@
this.innerHTML =
'<ul>' +
'<li><a href="" Failures</a></li>' +
- '<li><a href="" Failures</a></li>' +
+ '<li><a href="" Failures</a></li>' +
'<li><a href="" +
'</ul>' +
'<div id="unexpected"></div>' +
- '<div id="failures"></div>' +
+ '<div id="expected"></div>' +
'<div id="results"></div>';
this._tabNames = [
'unexpected',
- 'failures',
+ 'expected',
'results',
]
this._tabs = $(this).tabs({
@@ -100,9 +100,9 @@
{
return this.tabNamed('unexpected');
},
- failures: function()
+ expected: function()
{
- return this.tabNamed('failures');
+ return this.tabNamed('expected');
},
results: function()
{
Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/ui_unittests.js (111227 => 111228)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/ui_unittests.js 2012-03-19 20:19:46 UTC (rev 111227)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/ui_unittests.js 2012-03-19 20:23:12 UTC (rev 111228)
@@ -123,7 +123,7 @@
var messageBox = new ui.MessageBox('The Title', 'First message');
messageBox.addMessage('Second Message');
equal(messageBox.outerHTML,
- '<div class="ui-dialog-content ui-widget-content" style="width: auto; min-height: 132px; height: auto; " scrolltop="0" scrollleft="0">' +
+ '<div class="ui-dialog-content ui-widget-content" style="width: auto; min-height: 130px; height: auto; " scrolltop="0" scrollleft="0">' +
'<div>' +
'<div class="message">First message</div>' +
'<div class="message">Second Message</div>' +
Modified: trunk/Tools/ChangeLog (111227 => 111228)
--- trunk/Tools/ChangeLog 2012-03-19 20:19:46 UTC (rev 111227)
+++ trunk/Tools/ChangeLog 2012-03-19 20:23:12 UTC (rev 111228)
@@ -1,3 +1,23 @@
+2012-03-19 Ojan Vafai <o...@chromium.org>
+
+ Change garden-o-matic All Failures tab to Expected Failures
+ https://bugs.webkit.org/show_bug.cgi?id=81540
+
+ Reviewed by Dimitri Glazkov.
+
+ Also, fix some broken unittests that had just gotten stale.
+
+ * BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/controllers.js:
+ * BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/controllers/rebaseline.js:
+ * BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/garden-o-matic.js:
+ * BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/model.js:
+ * BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/results.js:
+ * BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/results_unittests.js:
+ * BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/ui.js:
+ * BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/ui/failures_unittests.js:
+ * BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/ui/notifications_unittests.js:
+ * BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/ui_unittests.js:
+
2012-03-19 Hao Zheng <zheng...@chromium.org>
[chromium] DRT crashes at shutdown.
