Changeset 94314 in webkit
- Timestamp:
- Sep 1, 2011 10:57:09 AM (13 years ago)
- Location:
- trunk/Tools
- Files:
-
- 12 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/base.js
r94309 r94314 84 84 }; 85 85 86 base.flattenArray = function(arrayOfArrays) 87 { 88 return arrayOfArrays.reduce(function(left, right) { 89 return left.concat(right); 90 }); 91 }; 92 86 93 base.filterDictionary = function(dictionary, predicate) 87 94 { -
trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/base_unittests.js
r94309 r94314 71 71 deepEqual(base.uniquifyArray(["a", "b", "b"]), ["a", "b"]); 72 72 deepEqual(base.uniquifyArray(["a", "b", "b", "a"]), ["a", "b"]); 73 }); 74 75 test("flattenArray", 5, function() { 76 deepEqual(base.flattenArray([]), []); 77 deepEqual(base.flattenArray([["a"]]), ["a"]); 78 deepEqual(base.flattenArray([["a",] ["b"]]), ["a", "b"]); 79 deepEqual(base.flattenArray([["a"], ["b", "c"]]), ["a", "b", "c"]); 80 deepEqual(base.flattenArray(["a"], [], ["b"]]), ["a", "b"]); 73 81 }); 74 82 -
trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/checkout.js
r93933 r94314 109 109 callIfCheckoutAvailable(function() { 110 110 base.callInSequence(function(failureInfo, callback) { 111 var extensionList = Array.prototype.concat.apply([], failureInfo.failureTypeList.map(results.failureTypeToExtensionList)); 112 base.callInSequence(function(extension, callback) { 113 net.post(config.kLocalServerURL + '/rebaseline?' + $.param({ 114 'builder': failureInfo.builderName, 115 'test': failureInfo.testName, 116 'extension': extension 117 }), function() { 118 callback(); 119 }); 120 }, extensionList, callback); 111 net.post(config.kLocalServerURL + '/rebaseline?' + $.param({ 112 'builder': failureInfo.builderName, 113 'test': failureInfo.testName, 114 }), function() { 115 callback(); 116 }); 121 117 }, failureInfoList, function() { 122 118 var testNameList = base.uniquifyArray(failureInfoList.map(function(failureInfo) { return failureInfo.testName; })); -
trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/checkout_unittests.js
r93933 r94314 41 41 { 42 42 equals(url, 'http://127.0.0.1:8127/updateexpectations'); 43 equals(data, '[{"builderName":"WebKit Linux","testName":"another/test.svg" ,"failureTypeList":["IMAGE"]}]');43 equals(data, '[{"builderName":"WebKit Linux","testName":"another/test.svg"}]'); 44 44 simulator.scheduleCallback(callback); 45 45 }; … … 49 49 'builderName': 'WebKit Linux', 50 50 'testName': 'another/test.svg', 51 'failureTypeList': ['IMAGE'],52 51 }], function() { 53 52 ok(true); … … 85 84 'builderName': 'WebKit Linux', 86 85 'testName': 'another/test.svg', 87 'failureTypeList': ['IMAGE'],88 86 }, { 89 87 'builderName': 'WebKit Mac10.6', 90 88 'testName': 'another/test.svg', 91 'failureTypeList': ['IMAGE+TEXT'],92 89 }, { 93 90 'builderName': 'Webkit Vista', 94 91 'testName': 'fast/test.html', 95 'failureTypeList': ['TEXT'],96 92 }], function() { 97 93 ok(true); … … 100 96 101 97 deepEqual(requestedURLs, [ 102 "http://127.0.0.1:8127/rebaseline?builder=WebKit+Linux&test=another%2Ftest.svg&extension=png", 103 "http://127.0.0.1:8127/rebaseline?builder=WebKit+Mac10.6&test=another%2Ftest.svg&extension=txt", 104 "http://127.0.0.1:8127/rebaseline?builder=WebKit+Mac10.6&test=another%2Ftest.svg&extension=png", 105 "http://127.0.0.1:8127/rebaseline?builder=Webkit+Vista&test=fast%2Ftest.html&extension=txt", 98 "http://127.0.0.1:8127/rebaseline?builder=WebKit+Linux&test=another%2Ftest.svg", 99 "http://127.0.0.1:8127/rebaseline?builder=WebKit+Mac10.6&test=another%2Ftest.svg", 100 "http://127.0.0.1:8127/rebaseline?builder=Webkit+Vista&test=fast%2Ftest.html", 106 101 "http://127.0.0.1:8127/optimizebaselines?test=another%2Ftest.svg", 107 102 "http://127.0.0.1:8127/optimizebaselines?test=fast%2Ftest.html" -
trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/controllers.js
r94312 r94314 44 44 $(this._view).bind('rebaseline', this.onRebaseline.bind(this)); 45 45 }, 46 _failureInfoForTestAndBuilder: function(testName, builderName)47 {48 return {49 'testName': testName,50 'builderName': builderName,51 'failureTypeList': results.failureTypeList(this._resultsByTest[testName][builderName].actual)52 }53 },54 46 showTest: function(testName) 55 47 { 56 48 var builderNameList = Object.keys(this._resultsByTest[testName]); 57 49 this._view.setBuilderList(builderNameList) 58 this._view.showResults( this._failureInfoForTestAndBuilder(testName, builderNameList[0]));50 this._view.showResults(results.failureInfoForTestAndBuilder(this._resultsByTest, testName, builderNameList[0])); 59 51 }, 60 52 onTestSelected: function() … … 63 55 }, 64 56 onBuilderSelected: function() { 65 this._view.showResults(this._failureInfoForTestAndBuilder(this._view.currentTestName(), 66 this._view.currentBuilderName())); 57 this._view.showResults(results.failureInfoForTestAndBuilder(this._resultsByTest, this._view.currentTestName(), this._view.currentBuilderName())); 67 58 }, 68 59 onRebaseline: function() { … … 102 93 this.onExamine(failure); 103 94 }.bind(this)); 95 $(failure).bind('rebaseline', function() { 96 this.onRebaseline(failure); 97 }.bind(this)); 104 98 } 105 99 failure.addFailureAnalysis(failureAnalysis); … … 133 127 $(resultsContainer).empty().append(resultsView); 134 128 onebar.select('results'); 129 }, 130 onRebaseline: function(failures) 131 { 132 failureInfoList = base.flattenArray(failures.testNameList().map(model.unexpectedFailureInfoForTestName)); 133 checkout.rebaseline(failureInfoList, function() { 134 // FIXME: We should have a better dialog than this! 135 alert('Rebaseline done! Please land with "webkit-patch land-cowboy".'); 136 }); 135 137 }, 136 138 onBlame: function(failure, commitData) -
trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/model.js
r93830 r94314 186 186 }; 187 187 188 model.unexpectedFailureInfoForTestName = function(testName) 189 { 190 var resultsByTest = results.unexpectedFailuresByTest(model.state.resultsByBuilder); 191 192 return Object.keys(resultsByTest[testName]).map(function(builderName) { 193 return results.failureInfoForTestAndBuilder(resultsByTest, testName, builderName); 194 }); 195 }; 196 188 197 model.analyzeUnexpectedSuccesses = function(callback) 189 198 { -
trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/results.js
r93259 r94314 296 296 }; 297 297 298 results.failureInfoForTestAndBuilder = function(resultsByTest, testName, builderName) 299 { 300 return { 301 'testName': testName, 302 'builderName': builderName, 303 'failureTypeList': results.failureTypeList(resultsByTest[testName][builderName].actual) 304 } 305 }; 306 298 307 results.collectUnexpectedResults = function(dictionaryOfResultNodes) 299 308 { -
trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/results_unittests.js
r93259 r94314 104 104 } 105 105 } 106 }); 107 }); 108 109 test("failureInfoForTestAndBuilder", 1, function() { 110 var unexpectedFailuresByTest = results.unexpectedFailuresByTest({ 111 "Mock Builder": kExampleResultsJSON 112 }); 113 var failureInfo = results.failureInfoForTestAndBuilder(unexpectedFailuresByTest, "userscripts/another-test.html", "Mock Builder"); 114 deepEqual(failureInfo, { 115 "testName": "userscripts/another-test.html", 116 "builderName": "Mock Builder", 117 "failureTypeList": ["TEXT"], 106 118 }); 107 119 }); -
trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/ui/notifications.js
r94312 r94314 155 155 this._problem.appendChild(new ui.actions.List([ 156 156 new ui.actions.Examine().makeDefault(), 157 new ui.actions.Rebaseline(), 157 158 ])); 158 159 this._testNameList = []; -
trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/ui/notifications_unittests.js
r94312 r94314 125 125 '<ul class="actions">' + 126 126 '<li><button class="action default" title="Examine these failures in detail.">Examine</button></li>' + 127 '<li><button class="action">Rebaseline</button></li>' + 127 128 '</ul>' + 128 129 '</div>' + … … 146 147 '<ul class="actions">' + 147 148 '<li><button class="action default" title="Examine these failures in detail.">Examine</button></li>' + 149 '<li><button class="action">Rebaseline</button></li>' + 148 150 '</ul>' + 149 151 '</div>' + … … 168 170 '<ul class="actions">' + 169 171 '<li><button class="action default" title="Examine these failures in detail.">Examine</button></li>' + 172 '<li><button class="action">Rebaseline</button></li>' + 170 173 '</ul>' + 171 174 '</div>' + … … 192 195 '<ul class="actions">' + 193 196 '<li><button class="action default" title="Examine these failures in detail.">Examine</button></li>' + 197 '<li><button class="action">Rebaseline</button></li>' + 194 198 '</ul>' + 195 199 '</div>' + … … 234 238 '<ul class="actions">' + 235 239 '<li><button class="action default" title="Examine these failures in detail.">Examine</button></li>' + 240 '<li><button class="action">Rebaseline</button></li>' + 236 241 '</ul>' + 237 242 '</div>' + … … 280 285 '<ul class="actions">' + 281 286 '<li><button class="action default" title="Examine these failures in detail.">Examine</button></li>' + 287 '<li><button class="action">Rebaseline</button></li>' + 282 288 '</ul>' + 283 289 '</div>' + … … 322 328 '<ul class="actions">' + 323 329 '<li><button class="action default" title="Examine these failures in detail.">Examine</button></li>' + 330 '<li><button class="action">Rebaseline</button></li>' + 324 331 '</ul>' + 325 332 '</div>' + -
trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/styles/notifications.css
r94311 r94314 24 24 */ 25 25 26 /* FIXME: This should really be in actions.css. */ 27 ul.actions>li { 28 display: inline-block; 29 } 30 26 31 ol.notifications { 27 32 list-style: none; -
trunk/Tools/ChangeLog
r94312 r94314 1 2011-09-01 Adam Barth <abarth@webkit.org> 2 3 Add a "rebaseline" button to the garden-o-matic summary page 4 https://bugs.webkit.org/show_bug.cgi?id=67382 5 6 Reviewed by Dimitri Glazkov. 7 8 As much as we might wish folks to not rebaseline entire test groups at 9 once, the truth is that doing so is a common operation. Adding a 10 button for this operation is likely to make folks happy. 11 12 This patch also cleans up a bunch of plumbing surrounding failureInfo 13 objects. 14 15 * BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/base.js: 16 * BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/base_unittests.js: 17 * BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/checkout.js: 18 * BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/checkout_unittests.js: 19 * BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/controllers.js: 20 * BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/model.js: 21 * BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/results.js: 22 * BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/results_unittests.js: 23 * BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/ui/notifications.js: 24 * BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/ui/notifications_unittests.js: 25 1 26 2011-09-01 Adam Barth <abarth@webkit.org> 2 27
Note: See TracChangeset
for help on using the changeset viewer.