Diff
Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/main.js (92350 => 92351)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/main.js 2011-08-04 05:34:55 UTC (rev 92350)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/main.js 2011-08-04 06:08:47 UTC (rev 92351)
@@ -71,35 +71,35 @@
});
}
-function showResultsDetail(testName, builderName, failureTypeList)
+function showResultsDetail(failureInfo)
{
- var failureTypes = failureTypeList.join(' ');
+ var failureTypes = failureInfo.failureTypeList.join(' ');
var content = $('.results-detail .content');
- if ($('.failure-details', content).attr(config.kBuilderNameAttr) == builderName &&
- $('.failure-details', content).attr(config.kTestNameAttr) == testName &&
+ if ($('.failure-details', content).attr(config.kBuilderNameAttr) == failureInfo.builderName &&
+ $('.failure-details', content).attr(config.kTestNameAttr) == failureInfo.testName &&
$('.failure-details', content).attr(config.kFailureTypesAttr) == failureTypes)
return;
displayOnButterbar('Loading...');
- results.fetchResultsURLs(builderName, testName, failureTypeList, function(resultsURLs) {
+ results.fetchResultsURLs(failureInfo, function(resultsURLs) {
var status = $('.results-detail .toolbar .status');
status.empty();
content.empty();
// FIXME: We should be passing the full list of failing builder names as the fourth argument.
- status.append(ui.failureDetailsStatus(testName, builderName, failureTypes, [builderName]));
+ status.append(ui.failureDetailsStatus(failureInfo, [failureInfo.builderName]));
content.append(ui.failureDetails(resultsURLs));
toggleButton($('.results-detail .actions .next'), g_resultsDetailsIterator.hasNext());
toggleButton($('.results-detail .actions .previous'), g_resultsDetailsIterator.hasPrevious());
- toggleButton($('.results-detail .actions .rebaseline'), results.canRebaseline(failureTypeList));
+ toggleButton($('.results-detail .actions .rebaseline'), results.canRebaseline(failureInfo.failureTypeList));
- $('.failure-details', content).attr(config.kBuilderNameAttr, builderName);
- $('.failure-details', content).attr(config.kTestNameAttr, testName);
+ $('.failure-details', content).attr(config.kTestNameAttr, failureInfo.testName);
+ $('.failure-details', content).attr(config.kBuilderNameAttr, failureInfo.builderName);
$('.failure-details', content).attr(config.kFailureTypesAttr, failureTypes);
if (!$('.results-detail').is(":visible"))
@@ -197,10 +197,7 @@
function showSelectedFailures()
{
- var argumentList = selectedFailures().map(function(failureInfo) {
- return [failureInfo.testName, failureInfo.builderName, failureInfo.failureTypeList];
- });
- g_resultsDetailsIterator = new base.CallbackIterator(showResultsDetail, argumentList);
+ g_resultsDetailsIterator = new base.CallbackIterator(showResultsDetail, selectedFailures());
g_resultsDetailsIterator.callNext();
}
Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/results.js (92350 => 92351)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/results.js 2011-08-04 05:34:55 UTC (rev 92350)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/results.js 2011-08-04 06:08:47 UTC (rev 92351)
@@ -418,12 +418,12 @@
return sortedURLs;
}
-results.fetchResultsURLs = function(builderName, testName, failureTypeList, callback)
+results.fetchResultsURLs = function(failureInfo, callback)
{
- var stem = resultsDirectoryURL(builderName);
- var testNameStem = base.trimExtension(testName);
+ var stem = resultsDirectoryURL(failureInfo.builderName);
+ var testNameStem = base.trimExtension(failureInfo.testName);
- var suffixList = possibleSuffixListFor(failureTypeList);
+ var suffixList = possibleSuffixListFor(failureInfo.failureTypeList);
var resultURLs = [];
var requestsInFlight = suffixList.length;
Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/results_unittests.js (92350 => 92351)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/results_unittests.js 2011-08-04 05:34:55 UTC (rev 92350)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/results_unittests.js 2011-08-04 06:08:47 UTC (rev 92351)
@@ -360,15 +360,27 @@
};
simulator.runTest(function() {
- results.fetchResultsURLs("Mock Builder", "userscripts/another-test.html", ['IMAGE', 'CRASH'], function(resultURLs) {
+ results.fetchResultsURLs({
+ 'builderName': "Mock Builder",
+ 'testName': "userscripts/another-test.html",
+ 'failureTypeList': ['IMAGE', 'CRASH'],
+ }, function(resultURLs) {
deepEqual(resultURLs, [
"http://build.chromium.org/f/chromium/layout_test_results/Mock_Builder/results/layout-test-results/userscripts/another-test-crash-log.txt"
]);
});
- results.fetchResultsURLs("Mock Builder", "userscripts/another-test.html", ['TIMEOUT'], function(resultURLs) {
+ results.fetchResultsURLs({
+ 'builderName': "Mock Builder",
+ 'testName': "userscripts/another-test.html",
+ 'failureTypeList': ['TIMEOUT'],
+ }, function(resultURLs) {
deepEqual(resultURLs, []);
});
- results.fetchResultsURLs("Mock Builder", "userscripts/taco.html", ['IMAGE', 'IMAGE+TEXT'], function(resultURLs) {
+ results.fetchResultsURLs({
+ 'builderName': "Mock Builder",
+ 'testName': "userscripts/taco.html",
+ 'failureTypeList': ['IMAGE', 'IMAGE+TEXT'],
+ }, function(resultURLs) {
deepEqual(resultURLs, [
"http://build.chromium.org/f/chromium/layout_test_results/Mock_Builder/results/layout-test-results/userscripts/taco-expected.png",
"http://build.chromium.org/f/chromium/layout_test_results/Mock_Builder/results/layout-test-results/userscripts/taco-actual.png",
Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/ui.js (92350 => 92351)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/ui.js 2011-08-04 05:34:55 UTC (rev 92350)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/ui.js 2011-08-04 06:08:47 UTC (rev 92351)
@@ -38,16 +38,18 @@
return block;
};
-ui.failureDetailsStatus = function(testName, selectedBuilderName, failureTypes, builderNameList)
+ui.failureDetailsStatus = function(failureInfo, builderNameList)
{
+ var failureTypes = failureInfo.failureTypeList.join(' ');
+
var block = $('<span><span class="test-name"></span><span class="builder-list"></span></span>');
- $('.test-name', block).addClass(failureTypes).text(testName);
+ $('.test-name', block).addClass(failureTypes).text(failureInfo.testName);
var builderList = $('.builder-list', block);
$.each(builderNameList, function(index, builderName) {
var builder = $('<span class="builder-name"></span>')
builder.text(builderName);
- if (builderName == selectedBuilderName)
+ if (builderName == failureInfo.builderName)
builder.addClass('selected');
builderList.append(builder);
});
Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/ui_unittests.js (92350 => 92351)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/ui_unittests.js 2011-08-04 05:34:55 UTC (rev 92350)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/ui_unittests.js 2011-08-04 06:08:47 UTC (rev 92351)
@@ -32,7 +32,11 @@
});
test("failureDetailsStatus", 1, function() {
- var status = ui.failureDetailsStatus('userscripts/another-test.html', 'Mock Builder', 'TEXT', ['Mock Builder', 'Another Builder']);
+ var status = ui.failureDetailsStatus({
+ 'builderName': 'Mock Builder',
+ 'testName': 'userscripts/another-test.html',
+ 'failureTypeList': ['TEXT'],
+ }, ['Mock Builder', 'Another Builder']);
status.wrap('<wrapper></wrapper>');
equal(status.parent().html(),
'<span>' +
Modified: trunk/Tools/ChangeLog (92350 => 92351)
--- trunk/Tools/ChangeLog 2011-08-04 05:34:55 UTC (rev 92350)
+++ trunk/Tools/ChangeLog 2011-08-04 06:08:47 UTC (rev 92351)
@@ -1,5 +1,22 @@
2011-08-03 Adam Barth <[email protected]>
+ Use failureInfo more pervasively in garden-o-matic
+ https://bugs.webkit.org/show_bug.cgi?id=65650
+
+ Reviewed by Dimitri Glazkov.
+
+ These three variable appears in concert together many places. This
+ patch unifies the remaining uses into being failureInfo objects, which
+ saves some marshalling.
+
+ * BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/main.js:
+ * BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/results.js:
+ * BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/results_unittests.js:
+ * BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/ui.js:
+ * BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/ui_unittests.js:
+
+2011-08-03 Adam Barth <[email protected]>
+
garden-o-matic should be able to update expecations from the details pane
https://bugs.webkit.org/show_bug.cgi?id=65648
