Changeset 95067 in webkit
- Timestamp:
- Sep 13, 2011 6:21:52 PM (13 years ago)
- Location:
- trunk/Tools
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/controllers.js
r95066 r95067 32 32 { 33 33 var statusView = new ui.MessageBox( 34 'Rebaseline status',34 'Rebaseline', 35 35 'Performing rebaseline...'); 36 36 … … 45 45 } 46 46 47 // FIXME: Where should this function go? 48 // FIXME: This should share more code with rebaselineWithStatusUpdates. 49 function updateExpectationsWithStatusUpdates(failureInfoList) 50 { 51 var statusView = new ui.MessageBox( 52 'Expectations Update', 53 'Updating expectations...'); 54 55 checkout.updateExpectations(failureInfoList, function() { 56 statusView.addMessage('Expectations update done! Please land with "webkit-patch land-cowboy".'); 57 statusView.addActionList(new ui.actions.List([new ui.actions.Close()])); 58 $(statusView).bind('close', statusView.close.bind(statusView)); 59 }); 60 } 61 47 62 controllers.ResultsDetails = base.extends(Object, { 48 63 init: function(view, resultsByTest) … … 55 70 $(this._view).bind('previous', this.onPrevious.bind(this)); 56 71 $(this._view).bind('rebaseline', this.onRebaseline.bind(this)); 72 $(this._view).bind('updateexpectations', this.onUpdateExpectations.bind(this)); 57 73 }, 58 74 onNext: function() … … 64 80 this._view.previousResult(); 65 81 }, 66 onRebaseline: function()82 _failureInfoList: function() 67 83 { 68 84 var testName = this._view.currentTestName(); 69 var failureInfoList =Object.keys(this._resultsByTest[testName]).map(function(builderName) {85 return Object.keys(this._resultsByTest[testName]).map(function(builderName) { 70 86 return { 71 87 'testName': testName, 72 88 'builderName': builderName 73 } 74 }); 75 rebaselineWithStatusUpdates(failureInfoList); 89 }; 90 }); 91 }, 92 onRebaseline: function() 93 { 94 rebaselineWithStatusUpdates(this._failureInfoList()); 95 }, 96 onUpdateExpectations: function() 97 { 98 updateExpectationsWithStatusUpdates(this._failureInfoList()); 76 99 } 77 100 }); … … 100 123 this.onRebaseline(failure); 101 124 }.bind(this)); 125 $(failure).bind('updateexpectations', function() { 126 this.onUpdateExpectations(failure); 127 }.bind(this)); 102 128 } 103 129 failure.addFailureAnalysis(failureAnalysis); … … 131 157 onebar.select('results'); 132 158 }, 159 _toFailureInfoList: function(failures) 160 { 161 return base.flattenArray(failures.testNameList().map(model.unexpectedFailureInfoForTestName)); 162 }, 133 163 onRebaseline: function(failures) 134 164 { 135 var failureInfoList = base.flattenArray(failures.testNameList().map(model.unexpectedFailureInfoForTestName)); 136 rebaselineWithStatusUpdates(failureInfoList); 165 rebaselineWithStatusUpdates(this._toFailureInfoList(failures)); 166 }, 167 onUpdateExpectations: function(failures) 168 { 169 updateExpectationsWithStatusUpdates(this._toFailureInfoList(failures)); 137 170 } 138 171 }); -
trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/ui/actions.js
r95066 r95067 84 84 }); 85 85 86 // FIXME: Rename all the code to match the user-visible name. 87 ui.actions.UpdateExpectations = base.extends(Action, { 88 init: function() { 89 this.textContent = 'Mark as Expected'; 90 this._eventName = 'updateexpectations'; 91 } 92 }); 93 86 94 ui.actions.Next = base.extends(Action, { 87 95 init: function() { -
trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/ui/notifications.js
r94540 r95067 155 155 new ui.actions.Examine().makeDefault(), 156 156 new ui.actions.Rebaseline(), 157 new ui.actions.UpdateExpectations(), 157 158 ])); 158 159 this._testNameList = []; -
trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/ui/notifications_unittests.js
r94540 r95067 116 116 '<li><button class="action default" title="Examine these failures in detail.">Examine</button></li>' + 117 117 '<li><button class="action">Rebaseline</button></li>' + 118 '<li><button class="action">Mark as Expected</button></li>' + 118 119 '</ul>' + 119 120 '</div>' + … … 138 139 '<li><button class="action default" title="Examine these failures in detail.">Examine</button></li>' + 139 140 '<li><button class="action">Rebaseline</button></li>' + 141 '<li><button class="action">Mark as Expected</button></li>' + 140 142 '</ul>' + 141 143 '</div>' + … … 161 163 '<li><button class="action default" title="Examine these failures in detail.">Examine</button></li>' + 162 164 '<li><button class="action">Rebaseline</button></li>' + 165 '<li><button class="action">Mark as Expected</button></li>' + 163 166 '</ul>' + 164 167 '</div>' + … … 186 189 '<li><button class="action default" title="Examine these failures in detail.">Examine</button></li>' + 187 190 '<li><button class="action">Rebaseline</button></li>' + 191 '<li><button class="action">Mark as Expected</button></li>' + 188 192 '</ul>' + 189 193 '</div>' + … … 229 233 '<li><button class="action default" title="Examine these failures in detail.">Examine</button></li>' + 230 234 '<li><button class="action">Rebaseline</button></li>' + 235 '<li><button class="action">Mark as Expected</button></li>' + 231 236 '</ul>' + 232 237 '</div>' + … … 276 281 '<li><button class="action default" title="Examine these failures in detail.">Examine</button></li>' + 277 282 '<li><button class="action">Rebaseline</button></li>' + 283 '<li><button class="action">Mark as Expected</button></li>' + 278 284 '</ul>' + 279 285 '</div>' + … … 319 325 '<li><button class="action default" title="Examine these failures in detail.">Examine</button></li>' + 320 326 '<li><button class="action">Rebaseline</button></li>' + 327 '<li><button class="action">Mark as Expected</button></li>' + 321 328 '</ul>' + 322 329 '</div>' + -
trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/ui/results.js
r94722 r95067 176 176 var header = document.createElement('h3'); 177 177 $(header).append(new ui.actions.List([ 178 new ui.actions.Rebaseline().makeDefault() 178 new ui.actions.Rebaseline().makeDefault(), 179 new ui.actions.UpdateExpectations(), 179 180 ])).append(link); 180 181 this.appendChild(header); -
trunk/Tools/ChangeLog
r95066 r95067 1 2011-09-13 Adam Barth <abarth@webkit.org> 2 3 garden-o-matic should be able to mark failures as expected 4 https://bugs.webkit.org/show_bug.cgi?id=68027 5 6 Reviewed by Dimitri Glazkov. 7 8 All the back-end infrastructure exists for this operation. This patch 9 just adds some UI to the front-end and wires that UI up to the back 10 end. This exact UI will likely need some more polish, but this should 11 be a reasonable first cut. 12 13 * BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/controllers.js: 14 * BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/ui/actions.js: 15 * BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/ui/notifications.js: 16 * BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/ui/notifications_unittests.js: 17 * BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/ui/results.js: 18 1 19 2011-09-13 Adam Barth <abarth@webkit.org> 2 20
Note: See TracChangeset
for help on using the changeset viewer.