Changeset 90924 in webkit

Timestamp:

Jul 13, 2011 10:01:38 AM (13 years ago)

Author:

abarth@webkit.org

Message:

Refine garden-o-matic status pane
​https://bugs.webkit.org/show_bug.cgi?id=64442

Reviewed by Dimitri Glazkov.

This patch makes two improvements to the status pane:

1) We only query the server for failure types that we're expecting.

This dramatically reduces the number of HTTP requests, making
loading the status pane faster.

2) The status pane now displays which test and which builder it is

showing results for.

• Scripts/webkitpy/tool/servers/data/gardeningserver/config.js:
• Scripts/webkitpy/tool/servers/data/gardeningserver/index.html:
• Scripts/webkitpy/tool/servers/data/gardeningserver/main.css:
• Scripts/webkitpy/tool/servers/data/gardeningserver/main.js:
• Scripts/webkitpy/tool/servers/data/gardeningserver/results.js:
• Scripts/webkitpy/tool/servers/data/gardeningserver/results_unittests.js:
• Scripts/webkitpy/tool/servers/data/gardeningserver/ui.js:

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/tool/servers/data/gardeningserver/config.js (modified) (1 diff)
• Scripts/webkitpy/tool/servers/data/gardeningserver/index.html (modified) (1 diff)
• Scripts/webkitpy/tool/servers/data/gardeningserver/main.css (modified) (2 diffs)
• Scripts/webkitpy/tool/servers/data/gardeningserver/main.js (modified) (4 diffs)
• Scripts/webkitpy/tool/servers/data/gardeningserver/results.js (modified) (6 diffs)
• Scripts/webkitpy/tool/servers/data/gardeningserver/results_unittests.js (modified) (2 diffs)
• Scripts/webkitpy/tool/servers/data/gardeningserver/ui.js (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2011-07-13  Adam Barth  <abarth@webkit.org>
+
+        Refine garden-o-matic status pane
+        https://bugs.webkit.org/show_bug.cgi?id=64442
+
+        Reviewed by Dimitri Glazkov.
+
+        This patch makes two improvements to the status pane:
+
+        1) We only query the server for failure types that we're expecting.
+           This dramatically reduces the number of HTTP requests, making
+           loading the status pane faster.
+
+        2) The status pane now displays which test and which builder it is
+           showing results for.
+
+        * Scripts/webkitpy/tool/servers/data/gardeningserver/config.js:
+        * Scripts/webkitpy/tool/servers/data/gardeningserver/index.html:
+        * Scripts/webkitpy/tool/servers/data/gardeningserver/main.css:
+        * Scripts/webkitpy/tool/servers/data/gardeningserver/main.js:
+        * Scripts/webkitpy/tool/servers/data/gardeningserver/results.js:
+        * Scripts/webkitpy/tool/servers/data/gardeningserver/results_unittests.js:
+        * Scripts/webkitpy/tool/servers/data/gardeningserver/ui.js:
+
 2011-07-13  Adam Barth  <abarth@webkit.org>
 

trunk/Tools/Scripts/webkitpy/tool/servers/data/gardeningserver/config.js

@@ -22 +22 @@
 config.kTestNameAttr = 'data-test-name';
 config.kBuilderNameAttr = 'data-builder-name';
+config.kFailureCountAttr = 'data-failure-count';
+config.kFailureTypesAttr = 'data-failure-types';
 
 })();

trunk/Tools/Scripts/webkitpy/tool/servers/data/gardeningserver/index.html

@@ -14 +14 @@
 <div class="results"></div>
 <div class="results-detail">
-<div class="toolbar"><a class="dismiss" href="#">Close</a></div><div class="content"></div></div>
+<div class="toolbar"><span class="status"></span> <a class="dismiss" href="#">Close</a></div><div class="content"></div></div>
 <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js"></script> 
 <script src="config.js"></script>

trunk/Tools/Scripts/webkitpy/tool/servers/data/gardeningserver/main.css

@@ -165 +165 @@
 .results-detail .toolbar {
     border-top: 1px solid #CCC;
-    text-align: right;
     border-bottom: 1px solid #CCC;
 }
 
-.results-detail .dismiss {
+.results-detail .toolbar .status {
+    display: inline-block;
+    padding: 5px;
+}
+
+.results-detail .toolbar .dismiss {
+    float: right;
     display: inline-block;
     padding: 5px;
@@ -193 +198 @@
 }
 
+.results-detail .failure-details img {
+  width: 100%;
+  height: auto;
+}
+
 .results-detail .failure-details td {
     height: 100%;

trunk/Tools/Scripts/webkitpy/tool/servers/data/gardeningserver/main.js

@@ -44 +44 @@
                 });
                 results.countFailureOccurances(builderNameList, testName, function(failureCount) {
-                    $(testSummary).attr('data-failure-count', failureCount);
+                    $(testSummary).attr(config.kFailureCountAttr, failureCount);
                     $('.failure-count', testSummary).text(ui.failureCount(failureCount));
                 });
@@ -57 +57 @@
 function showResultsDetail()
 {
+    var testBlock = $(this).parents('.test');
     var builderName = $(this).attr(config.kBuilderNameAttr);
-    var testName = $('.what', $(this).parents('.test')).text();
+    var testName = $('.what', testBlock).text();
+    var failureTypeList = testBlock.attr(config.kFailureTypesAttr).split(' ');
 
     var content = $('.results-detail .content');
@@ -66 +68 @@
     displayOnButterbar('Loading results');
 
-    results.fetchResultsURLs(builderName, testName, function(resultsURLs) {
+    results.fetchResultsURLs(builderName, testName, failureTypeList, function(resultsURLs) {
+        var status = $('.results-detail .toolbar .status');
+
         function appendResults() {
+            status.text(testName + ' [' + builderName + ']');
             content.append(ui.failureDetails(resultsURLs));
             $('.results', content).attr(config.kBuilderNameAttr, builderName);
@@ -76 +81 @@
         if (children.length && $('.results-detail').is(":visible")) {
             // The results-detail pane is already open. Let's do a quick cross-fade.
+            status.fadeOut('fast');
             children.fadeOut('fast', function() {
                 content.empty();
                 appendResults();
+                status.fadeIn('fast');
                 content.children().hide().fadeIn('fast', dismissButterbar);
             });

trunk/Tools/Scripts/webkitpy/tool/servers/data/gardeningserver/results.js

@@ -11 +11 @@
 var kLayoutTestResultsServer = 'http://build.chromium.org/f/chromium/layout_test_results/';
 var kLayoutTestResultsPath = '/results/layout-test-results/';
-
-// FIXME: Add support for the rest of the result types.
-var kPossibleSuffixList = [
-    '-expected.png',
-    '-actual.png',
-    '-diff.png',
-    // '-expected.txt',
-    // '-actual.txt',
-    '-diff.txt',
-    '-crash-log.txt',
-    // '-wdiff.html',
-    // '-pretty-diff.html',
-    // '-expected.html',
-    // '-expected-mismatch.html',
-    // '-expected.wav',
-    // '-actual.wav',
-    // ... and possibly more.
-];
 
 var PASS = 'PASS';
@@ -39 +21 @@
 var kFailingResults = [TIMEOUT, TEXT, CRASH, IMAGE, IMAGE_TEXT];
 
+var kExpectedImageSuffix = '-expected.png';
+var kActualImageSuffix = '-actual.png';
+var kImageDiffSuffix = '-diff.png';
+var kTextDiffSuffix = '-diff.txt';
+var kCrashLogSuffix = '-crash-log.txt';
+
+var kPreferredSuffixOrder = [
+    kExpectedImageSuffix,
+    kActualImageSuffix,
+    kImageDiffSuffix,
+    kTextDiffSuffix,
+    kCrashLogSuffix,
+    // FIXME: Add support for the rest of the result types.
+];
+
 // Kinds of results.
 results.kActualKind = 'actual';
@@ -68 +65 @@
         name: testName,
     };
+}
+
+function possibleSuffixListFor(failureTypeList)
+{
+    var suffixList = [];
+
+    function pushImageSuffixes()
+    {
+        suffixList.push(kExpectedImageSuffix);
+        suffixList.push(kActualImageSuffix);
+        suffixList.push(kImageDiffSuffix);
+    }
+
+    function pushTextSuffixes()
+    {
+        // '-expected.txt',
+        // '-actual.txt',
+        suffixList.push(kTextDiffSuffix);
+        // '-wdiff.html',
+        // '-pretty-diff.html',
+    }
+
+    $.each(failureTypeList, function(index, failureType) {
+        switch(failureType) {
+            case IMAGE:
+                pushImageSuffixes();
+                break;
+            case TEXT:
+                pushTextSuffixes();
+                break;
+            case IMAGE_TEXT:
+                pushImageSuffixes();
+                pushTextSuffixes();
+                break;
+            case CRASH:
+                suffixList.push(kCrashLogSuffix);
+                break;
+            default:
+                // FIXME: Add support for the rest of the result types.
+                // '-expected.html',
+                // '-expected-mismatch.html',
+                // '-expected.wav',
+                // '-actual.wav',
+                // ... and possibly more.
+                break;
+        }
+    });
+
+    return suffixList;
 }
 
@@ -362 +408 @@
 {
     var sortedURLs = [];
-    $.each(kPossibleSuffixList, function(i, suffix) {
+    $.each(kPreferredSuffixOrder, function(i, suffix) {
         $.each(urls, function(j, url) {
             if (!base.endsWith(url, suffix))
@@ -374 +420 @@
 }
 
-results.fetchResultsURLs = function(builderName, testName, callback)
+results.fetchResultsURLs = function(builderName, testName, failureTypeList, callback)
 {
     var stem = resultsDirectoryURL(builderName);
     var testNameStem = base.trimExtension(testName);
 
+    var suffixList = possibleSuffixListFor(failureTypeList);
+
     var resultURLs = [];
-    var requestsInFlight = kPossibleSuffixList.length;
+    var requestsInFlight = suffixList.length;
 
     function checkComplete()
@@ -388 +436 @@
     }
 
-    $.each(kPossibleSuffixList, function(index, suffix) {
+    $.each(suffixList, function(index, suffix) {
         var url = stem + testNameStem + suffix;
         base.probe(url, {

trunk/Tools/Scripts/webkitpy/tool/servers/data/gardeningserver/results_unittests.js

@@ -343 +343 @@
 
     simulator.runTest(function() {
-        results.fetchResultsURLs("Mock Builder", "userscripts/another-test.html", function(resultURLs) {
+        results.fetchResultsURLs("Mock Builder", "userscripts/another-test.html", ['IMAGE', 'CRASH'], function(resultURLs) {
             deepEqual(resultURLs, [
-                "http://build.chromium.org/f/chromium/layout_test_results/Mock_Builder/results/layout-test-results/userscripts/another-test-diff.txt",
                 "http://build.chromium.org/f/chromium/layout_test_results/Mock_Builder/results/layout-test-results/userscripts/another-test-crash-log.txt"
             ]);
@@ -355 +354 @@
         "http://build.chromium.org/f/chromium/layout_test_results/Mock_Builder/results/layout-test-results/userscripts/another-test-actual.png",
         "http://build.chromium.org/f/chromium/layout_test_results/Mock_Builder/results/layout-test-results/userscripts/another-test-diff.png",
-        "http://build.chromium.org/f/chromium/layout_test_results/Mock_Builder/results/layout-test-results/userscripts/another-test-diff.txt",
         "http://build.chromium.org/f/chromium/layout_test_results/Mock_Builder/results/layout-test-results/userscripts/another-test-crash-log.txt"
     ]);

trunk/Tools/Scripts/webkitpy/tool/servers/data/gardeningserver/ui.js

@@ -39 +39 @@
         '</div>');
     $('.what a', block).text(testName).attr('href', ui.urlForTest(testName)).attr('class', unexpectedResults.join(' '));
+    block.attr(config.kFailureTypesAttr, unexpectedResults);
 
     var where = $('.where', block);