Changeset 112149 in webkit

Timestamp:

Mar 26, 2012 2:56:01 PM (12 years ago)

Author:

ojan@chromium.org

Message:

garden-o-matic should special case reftests
​https://bugs.webkit.org/show_bug.cgi?id=81812

Reviewed by Adam Barth.

On the examine page, don't show a rebaseline button for reftests.
We still show it on the failure summary page because tests are grouped
together. Long-term, we should make sure webkit-patch rebaseline-test
never tries to rebaseline reftests.

• BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/controllers.js:
• BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/ui/results.js:
• BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/styles/results.css:

Location:

trunk/Tools

Files:

• BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/controllers.js (modified) (1 diff)
• BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/ui/results.js (modified) (2 diffs)
• BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/ui/results_unittests.js (modified) (3 diffs)
• BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/styles/results.css (modified) (2 diffs)
• ChangeLog (modified) (1 diff)

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

@@ -33 +33 @@
 function rebaselineWithStatusUpdates(failureInfoList)
 {
+    // FIXME: If a test is a reftest, webkit-patch rebaseline-test should error out
+    // and we should alert (modal dialog?) the user.
     var statusView = new ui.StatusArea('Rebaseline');
     var id = statusView.newId();

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

@@ -172 +172 @@
 })
 
+function isAnyReftest(testName, resultsByTest)
+{
+    return Object.keys(resultsByTest[testName]).map(function(builder) {
+        return resultsByTest[testName][builder];
+    }).some(function(resultNode) {
+        return resultNode.is_reftest || resultNode.is_mismatch_reftest
+    });
+}
+
 ui.results.TestSelector = base.extends('div', {
     init: function(delegate, resultsByTest)
@@ -189 +198 @@
 
             var header = document.createElement('h3');
-            $(header).append(new ui.actions.List([
-                new ui.actions.Rebaseline().makeDefault(),
-            ])).append(nonLinkTitle).append(linkTitle);
+            if (isAnyReftest(testName, resultsByTest))
+                $(header).append('<div class="non-action-button">Reftests cannot be rebaselined. Email webkit-gardening@chromium.org if unsure how to fix this.</div>');
+            else
+                $(header).append(new ui.actions.List([new ui.actions.Rebaseline().makeDefault()]));
+
+            $(header).append(nonLinkTitle).append(linkTitle);
             this.appendChild(header);
             this.appendChild(this._delegate.contentForTest(testName));

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

@@ -45 +45 @@
         }
     }
-}
+};
+
+var kExampleReftestResults = {
+    "reftest.html": {
+        "Mock Builder": {
+            "expected": "PASS",
+            "actual": "IMAGE",
+            "is_reftest": true
+        }
+    },
+    "mismatch-reftest.html": {
+        "Mock Builder": {
+            "expected": "PASS",
+            "actual": "IMAGE",
+            "is_mismatch_reftest": true
+        }
+    }
+};
 
 var kExampleResultsWithTimeoutByTest = {
@@ -54 +71 @@
         }
     }
-}
+};
 
 test('View', 8, function() {
@@ -78 +95 @@
 });
 
+test('View', 2, function() {
+    var delegate = {
+        fetchResultsURLs: function(failureInfo, callback) { return; }
+    };
+
+    var view = new ui.results.View(delegate);
+    view.setResultsByTest(kExampleReftestResults);
+
+    equals($('.non-action-button', view).length, 2);
+    equals($('.action', view).length, 0);
+});
+
 test('View of timeouts', 1, function() {
     var delegate = {

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

@@ -24 +24 @@
  */
 
-.results-view ul.actions, .ui-dialog ul.actions {
+.non-action-button, .results-view ul.actions, .ui-dialog ul.actions {
     float: right;
     margin: 0;
@@ -30 +30 @@
     list-style: none;
     display: inline-block;
+}
+
+.non-action-button {
+    padding: 5px;
 }
 

trunk/Tools/ChangeLog

@@ +1 @@
+2012-03-26  Ojan Vafai  <ojan@chromium.org>
+
+        garden-o-matic should special case reftests
+        https://bugs.webkit.org/show_bug.cgi?id=81812
+
+        Reviewed by Adam Barth.
+
+        On the examine page, don't show a rebaseline button for reftests.
+        We still show it on the failure summary page because tests are grouped
+        together. Long-term, we should make sure webkit-patch rebaseline-test
+        never tries to rebaseline reftests.
+
+        * BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/controllers.js:
+        * BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/ui/results.js:
+        * BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/styles/results.css:
+
 2012-03-26  Dirk Pranke  <dpranke@chromium.org>