Changeset 92351 in webkit

Timestamp:

Aug 3, 2011 11:08:47 PM (13 years ago)

Author:

abarth@webkit.org

Message:

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:

Location:

trunk/Tools

Files:

• BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/main.js (modified) (4 diffs)
• BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/results.js (modified) (1 diff)
• BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/results_unittests.js (modified) (1 diff)
• BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/ui.js (modified) (2 diffs)
• BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/ui_unittests.js (modified) (1 diff)
• ChangeLog (modified) (1 diff)

trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/main.js

@@ -72 +72 @@
 }
 
-function showResultsDetail(testName, builderName, failureTypeList)
-{
-    var failureTypes = failureTypeList.join(' ');
+function showResultsDetail(failureInfo)
+{
+    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;
@@ -85 +85 @@
     displayOnButterbar('Loading...');
 
-    results.fetchResultsURLs(builderName, testName, failureTypeList, function(resultsURLs) {
+    results.fetchResultsURLs(failureInfo, function(resultsURLs) {
         var status = $('.results-detail .toolbar .status');
 
@@ -92 +92 @@
 
         // 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));
-
-        $('.failure-details', content).attr(config.kBuilderNameAttr, builderName);
-        $('.failure-details', content).attr(config.kTestNameAttr, testName);
+        toggleButton($('.results-detail .actions .rebaseline'), results.canRebaseline(failureInfo.failureTypeList));
+
+        $('.failure-details', content).attr(config.kTestNameAttr, failureInfo.testName);
+        $('.failure-details', content).attr(config.kBuilderNameAttr, failureInfo.builderName);
         $('.failure-details', content).attr(config.kFailureTypesAttr, failureTypes);
 
@@ -198 +198 @@
 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();
 }

trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/results.js

@@ -419 +419 @@
 }
 
-results.fetchResultsURLs = function(builderName, testName, failureTypeList, callback)
-{
-    var stem = resultsDirectoryURL(builderName);
-    var testNameStem = base.trimExtension(testName);
-
-    var suffixList = possibleSuffixListFor(failureTypeList);
+results.fetchResultsURLs = function(failureInfo, callback)
+{
+    var stem = resultsDirectoryURL(failureInfo.builderName);
+    var testNameStem = base.trimExtension(failureInfo.testName);
+
+    var suffixList = possibleSuffixListFor(failureInfo.failureTypeList);
 
     var resultURLs = [];

trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/results_unittests.js

@@ -361 +361 @@
 
     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",

trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/ui.js

@@ -39 +39 @@
 };
 
-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);
@@ -48 +50 @@
         var builder = $('<span class="builder-name"></span>')
         builder.text(builderName);
-        if (builderName == selectedBuilderName)
+        if (builderName == failureInfo.builderName)
             builder.addClass('selected');
         builderList.append(builder);

trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/ui_unittests.js

@@ -33 +33 @@
 
 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(),

trunk/Tools/ChangeLog

@@ +1 @@
+2011-08-03  Adam Barth  <abarth@webkit.org>
+
+        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  <abarth@webkit.org>