garden-o-matic's "Expect Failure" button does not work correctly, so we should remove...

https://bugs.webkit.org/show_bug.cgi?id=69954

Also renamed the action and associated event name to address an FIXME.

Reviewed by Adam Barth.

* BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/controllers.js: Renamed event name.
* BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/ui/actions.js: Renamed the action.
* BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/ui/results.js: Removed action temporarily.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@97302 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/controllers.js b/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/controllers.js
index 398286f8e1026123ebf83de30f9bf235d668a604..05dacdbeb759c8a766642c2f1291b416e720b7bc 100644 (file)
--- a/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/controllers.js
+++ b/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/controllers.js
@@ -67,7 +67,7 @@ controllers.ResultsDetails = base.extends(Object, {
         $(this._view).bind('next', this.onNext.bind(this));
         $(this._view).bind('previous', this.onPrevious.bind(this));
         $(this._view).bind('rebaseline', this.onRebaseline.bind(this));
-        $(this._view).bind('updateexpectations', this.onUpdateExpectations.bind(this));
+        $(this._view).bind('expectfailure', this.onUpdateExpectations.bind(this));
     },
     onNext: function()
     {
@@ -119,7 +119,7 @@ var FailureStreamController = base.extends(Object, {
             $(failure).bind('rebaseline', function() {
                 this.onRebaseline(failure);
             }.bind(this));
-            $(failure).bind('updateexpectations', function() {
+            $(failure).bind('expectfailure', function() {
                 this.onUpdateExpectations(failure);
             }.bind(this));
         }

diff --git a/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/ui/actions.js b/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/ui/actions.js
index a0acac0622544f1a5dd3d79b915608342f3fa705..6eb40410fbfff0b7689c98f4b3b935cb423ae3b8 100644 (file)
--- a/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/ui/actions.js
+++ b/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/ui/actions.js
@@ -83,11 +83,10 @@ ui.actions.Rebaseline = base.extends(Action, {
     }
 });
 
-// FIXME: Rename all the code to match the user-visible name.
-ui.actions.UpdateExpectations = base.extends(Action, {
+ui.actions.ExpectFailure = base.extends(Action, {
     init: function() {
         this.textContent = 'Expect Failure';
-        this._eventName = 'updateexpectations';
+        this._eventName = 'expectfailure';
     }
 });
 

diff --git a/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/ui/results.js b/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/ui/results.js
index 5de3ee84527fb946971f0d77271fa06d8e18b061..38bc77080569f4e21455545f5da13ce3a56794d4 100644 (file)
--- a/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/ui/results.js
+++ b/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/ui/results.js
@@ -176,7 +176,6 @@ ui.results.TestSelector = base.extends('div', {
             var header = document.createElement('h3');
             $(header).append(new ui.actions.List([
                 new ui.actions.Rebaseline().makeDefault(),
-                new ui.actions.UpdateExpectations(),
             ])).append(link);
             this.appendChild(header);
             this.appendChild(this._delegate.contentForTest(testName));

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 15408d1c9eed76e30e1d6e02f83af0a8fa032ee8..9085a60b6c5cb966c492d8263e642dbd3e0190ca 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,16 @@
+2011-10-12  Dimitri Glazkov  <dglazkov@chromium.org>
+
+        garden-o-matic's "Expect Failure" button does not work correctly, so we should remove it until the plumbing is fixed to avoid landmines.
+        https://bugs.webkit.org/show_bug.cgi?id=69954
+
+        Also renamed the action and associated event name to address an FIXME.
+
+        Reviewed by Adam Barth.
+
+        * BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/controllers.js: Renamed event name.
+        * BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/ui/actions.js: Renamed the action.
+        * BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/ui/results.js: Removed action temporarily.
+
 2011-10-12  Tony Chang  <tony@chromium.org>
 
         stop spamming 'stopping test driver timed out, killing it' when running rwt