Changeset 92346 in webkit

Timestamp:

Aug 3, 2011 9:16:47 PM (13 years ago)

Author:

abarth@webkit.org

Message:

Add UI to garden-o-matic for updating expectations
​https://bugs.webkit.org/show_bug.cgi?id=65644

Reviewed by Dimitri Glazkov.

The patch plumbs the UI back to the gardening server, but the gardening
server endpoint is just a stub at this point.

• BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/checkout.js:
• BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/garden-o-matic.html:
• BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/main.js:
• BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/model.js:
• Scripts/webkitpy/tool/servers/gardeningserver.py:
• Scripts/webkitpy/tool/servers/reflectionhandler.py:

Location:

trunk/Tools

Files:

• BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/checkout.js (modified) (3 diffs)
• BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/garden-o-matic.html (modified) (1 diff)
• BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/main.js (modified) (7 diffs)
• BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/model.js (modified) (1 diff)
• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/tool/servers/gardeningserver.py (modified) (1 diff)
• Scripts/webkitpy/tool/servers/reflectionhandler.py (modified) (1 diff)

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

@@ -29 +29 @@
 };
 
+checkout.updateExpectations = function(failureInfoList, callback)
+{
+    $.post('/updateexpectations', JSON.stringify(failureInfoList), function() {
+        callback();
+    });
+};
+
 checkout.optimizeBaselines = function(testName, callback)
 {
@@ -38 +45 @@
 };
 
-checkout.rebaseline = function(rebaselineTasks, callback)
+checkout.rebaseline = function(failureInfoList, callback)
 {
-    base.callInSequence(function(task, callback) {
-        var extensionList = Array.prototype.concat.apply([], task.failureTypeList.map(results.failureTypeToExtensionList));
+    base.callInSequence(function(failureInfo, callback) {
+        var extensionList = Array.prototype.concat.apply([], failureInfo.failureTypeList.map(results.failureTypeToExtensionList));
         base.callInSequence(function(extension, callback) {
             $.post('/rebaseline?' + $.param({
-                'builder': task.builderName,
-                'test': task.testName,
+                'builder': failureInfo.builderName,
+                'test': failureInfo.testName,
                 'extension': extension
             }), function() {
@@ -51 +58 @@
             });
         }, extensionList, callback);
-    }, rebaselineTasks, function() {
-        var testNameList = base.uniquifyArray(rebaselineTasks.map(function(task) { return task.testName; }));
+    }, failureInfoList, function() {
+        var testNameList = base.uniquifyArray(failureInfoList.map(function(failureInfo) { return failureInfo.testName; }));
         base.callInSequence(checkout.optimizeBaselines, testNameList, callback);
     });

trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/garden-o-matic.html

@@ -16 +16 @@
     <button class="show-selected-failures">Show Selected Failures</button>
     <button class="rebaseline-selected">Rebaseline Selected</button>
+    <button class="add-selected-expectations">Mark Selected as Expected</button>
     <button class="refresh">Refresh</button>
 </div>

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

@@ -60 +60 @@
 }
 
-function rebaseline(rebaselineTasks)
+function rebaseline(failureInfoList)
 {
     displayOnButterbar('Rebaselining...');
-    checkout.rebaseline(rebaselineTasks, function() {
+    checkout.rebaseline(failureInfoList, function() {
         dismissButterbar();
         // FIXME: We should use something like a lightbox rather than alert!
         alert('New results downloaded to your working copy. Please use "webkit-patch land-cowboy" to land the updated baselines.');
     });
+}
+
+function updateExpectations(failureInfoList)
+{
+    displayOnButterbar('Adding expectations...');
+    checkout.updateExpectations(failureInfoList, dismissButterbar);
 }
 
@@ -110 +116 @@
 function executeQueuedRebaselines()
 {
-    var rebaselineQueue = model.takeRebaselineQueue();
-    if (!rebaselineQueue.length)
+    var failureInfoList = model.takeRebaselineQueue();
+    if (!failureInfoList.length)
         return;
     // FIXME: Should we confirm with the use before executing the queue?
-    rebaseline(rebaselineQueue);
+    rebaseline(failureInfoList);
 }
 
@@ -157 +163 @@
 function selectedFailures()
 {
-    var failures = [];
+    var failureInfoList = [];
 
     $('.test input:checkbox').each(function() {
@@ -170 +176 @@
             var failureTypeList = failureTypes.split(' ');
             var builderName = $(this).attr(config.kBuilderNameAttr);
-            failures.push({
+            failureInfoList.push({
                 'testName': testName,
                 'builderName': builderName,
@@ -178 +184 @@
     });
 
-    return failures;
+    return failureInfoList;
 }
 
@@ -186 +192 @@
 }
 
+function updateExpectationsForSelected()
+{
+    updateExpectations(selectedFailures());
+}
+
 function showSelectedFailures()
 {
-    var argumentList = selectedFailures().map(function(failureDescription) {
-        return [failureDescription.testName, failureDescription.builderName, failureDescription.failureTypeList];
+    var argumentList = selectedFailures().map(function(failureInfo) {
+        return [failureInfo.testName, failureInfo.builderName, failureInfo.failureTypeList];
     });
     g_resultsDetailsIterator = new base.CallbackIterator(showResultsDetail, argumentList);
@@ -266 +277 @@
 $('.show-selected-failures').live('click', showSelectedFailures);
 $('.rebaseline-selected').live('click', rebaselineSelected);
+$('.update-expectations-selected').live('click', updateExpectationsForSelected);
 $('.refresh').live('click', update);
 

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

@@ -58 +58 @@
 {
     var unexpectedFailures = results.unexpectedFailuresByTest(model.state.resultsByBuilder);
-    console.log(unexpectedFailures);
 
     $.each(model.state.failureAnalysisByTest, function(testName, failureAnalysis) {

trunk/Tools/ChangeLog

@@ +1 @@
+2011-08-03  Adam Barth  <abarth@webkit.org>
+
+        Add UI to garden-o-matic for updating expectations
+        https://bugs.webkit.org/show_bug.cgi?id=65644
+
+        Reviewed by Dimitri Glazkov.
+
+        The patch plumbs the UI back to the gardening server, but the gardening
+        server endpoint is just a stub at this point.
+
+        * BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/checkout.js:
+        * BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/garden-o-matic.html:
+        * BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/main.js:
+        * BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/model.js:
+        * Scripts/webkitpy/tool/servers/gardeningserver.py:
+        * Scripts/webkitpy/tool/servers/reflectionhandler.py:
+
 2011-08-03  Adam Barth  <abarth@webkit.org>
 

trunk/Tools/Scripts/webkitpy/tool/servers/gardeningserver.py

@@ -81 +81 @@
         self._serve_text('success')
 
+    def updateexpectations(self):
+        failure_info_list = self._read_entity_body_as_json()
+        print 'FailureInfoList:', failure_info_list
+        self._serve_text('success')
+
     def rebaseline(self):
         builder = self.query['builder'][0]

trunk/Tools/Scripts/webkitpy/tool/servers/reflectionhandler.py

@@ -61 +61 @@
     def do_POST(self):
         self._handle_request()
+
+    def _read_entity_body(self):
+        length = int(self.headers.getheader('content-length'))
+        return self.rfile.read(length)
+
+    def _read_entity_body_as_json(self):
+        return json.loads(self._read_entity_body())
 
     def _handle_request(self):