Changeset 96153 in webkit
- Timestamp:
- Sep 27, 2011 2:02:34 PM (13 years ago)
- Location:
- trunk/Tools
- Files:
-
- 1 added
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/run-unittests.html
r93801 r96153 66 66 <script src="scripts/ui/notifications.js"></script> 67 67 <script src="scripts/ui/notifications_unittests.js"></script> 68 <script src="scripts/controllers_unittests.js"></script> 68 69 69 70 <!-- FIXME: We should have tests for these files! --> -
trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/controllers.js
r95069 r96153 101 101 _createFailureView: function(failureAnalysis) { throw "Not implemented!"; }, 102 102 103 init: function(view) 104 { 103 init: function(model, view, delegate) 104 { 105 this._model = model; 105 106 this._view = view; 107 this._delegate = delegate; 106 108 this._testFailures = new base.UpdateTracker(); 107 109 }, … … 140 142 var testNameList = failures.testNameList(); 141 143 var failuresByTest = base.filterDictionary( 142 this._resultsFilter( model.state.resultsByBuilder),144 this._resultsFilter(this._model.resultsByBuilder), 143 145 function(key) { 144 146 return testNameList.indexOf(key) != -1; … … 146 148 147 149 var controller = new controllers.ResultsDetails(resultsView, failuresByTest); 148 149 // FIXME: This doesn't belong here. 150 var onebar = $('#onebar')[0]; 151 var resultsContainer = onebar.results(); 152 $(resultsContainer).empty().append(resultsView); 153 onebar.select('results'); 150 this._delegate.showResults(resultsView); 154 151 }, 155 152 _toFailureInfoList: function(failures) … … 168 165 169 166 controllers.UnexpectedFailures = base.extends(FailureStreamController, { 170 _resultsFilter: results. expectedOrUnexpectedFailuresByTest,167 _resultsFilter: results.unexpectedFailuresByTest, 171 168 172 169 _impliedFirstFailingRevision: function(failureAnalysis) -
trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/garden-o-matic.js
r95069 r96153 61 61 onebar.attach(); 62 62 63 // FIXME: This doesn't belong here. 64 var onebarController = { 65 showResults: function(resultsView) 66 { 67 var resultsContainer = onebar.results(); 68 $(resultsContainer).empty().append(resultsView); 69 onebar.select('results'); 70 } 71 }; 72 63 73 var unexpectedFailuresView = new ui.notifications.Stream(); 64 g_unexpectedFailuresController = new controllers.UnexpectedFailures( unexpectedFailuresView);74 g_unexpectedFailuresController = new controllers.UnexpectedFailures(model.state, unexpectedFailuresView, onebarController); 65 75 66 76 var failuresView = new ui.notifications.Stream(); 67 g_failuresController = new controllers.Failures( failuresView);77 g_failuresController = new controllers.Failures(model.state, failuresView, onebarController); 68 78 69 79 g_info = new ui.notifications.Stream(); -
trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/results_unittests.js
r94486 r96153 24 24 */ 25 25 26 var unittest = unittest || {}; 27 26 28 (function () { 27 29 28 30 module("results"); 29 31 30 varkExampleResultsJSON = {32 unittest.kExampleResultsJSON = { 31 33 "tests": { 32 34 "scrollbars": { … … 70 72 71 73 test("unexpectedFailures", 1, function() { 72 var unexpectedFailures = results.unexpectedFailures( kExampleResultsJSON);74 var unexpectedFailures = results.unexpectedFailures(unittest.kExampleResultsJSON); 73 75 deepEqual(unexpectedFailures, { 74 76 "userscripts/another-test.html": { … … 81 83 test("unexpectedFailuresByTest", 1, function() { 82 84 var unexpectedFailuresByTest = results.unexpectedFailuresByTest({ 83 "Mock Builder": kExampleResultsJSON85 "Mock Builder": unittest.kExampleResultsJSON 84 86 }); 85 87 deepEqual(unexpectedFailuresByTest, { … … 95 97 test("unexpectedSuccessesByTest", 1, function() { 96 98 var unexpectedFailuresByTest = results.unexpectedSuccessesByTest({ 97 "Mock Builder": kExampleResultsJSON99 "Mock Builder": unittest.kExampleResultsJSON 98 100 }); 99 101 deepEqual(unexpectedFailuresByTest, { … … 109 111 test("failureInfoForTestAndBuilder", 1, function() { 110 112 var unexpectedFailuresByTest = results.unexpectedFailuresByTest({ 111 "Mock Builder": kExampleResultsJSON113 "Mock Builder": unittest.kExampleResultsJSON 112 114 }); 113 115 var failureInfo = results.failureInfoForTestAndBuilder(unexpectedFailuresByTest, "userscripts/another-test.html", "Mock Builder"); … … 150 152 151 153 test("resultNodeForTest", 4, function() { 152 deepEqual(results.resultNodeForTest( kExampleResultsJSON, "userscripts/another-test.html"), {154 deepEqual(results.resultNodeForTest(unittest.kExampleResultsJSON, "userscripts/another-test.html"), { 153 155 "expected": "PASS", 154 156 "actual": "TEXT" 155 157 }); 156 equals(results.resultNodeForTest( kExampleResultsJSON, "foo.html"), null);157 equals(results.resultNodeForTest( kExampleResultsJSON, "userscripts/foo.html"), null);158 equals(results.resultNodeForTest( kExampleResultsJSON, "userscripts/foo/bar.html"), null);158 equals(results.resultNodeForTest(unittest.kExampleResultsJSON, "foo.html"), null); 159 equals(results.resultNodeForTest(unittest.kExampleResultsJSON, "userscripts/foo.html"), null); 160 equals(results.resultNodeForTest(unittest.kExampleResultsJSON, "userscripts/foo/bar.html"), null); 159 161 }); 160 162 -
trunk/Tools/ChangeLog
r96148 r96153 1 2011-09-27 Adam Barth <abarth@webkit.org> 2 3 garden-o-matic examine buttons shows both expected and unexpected failures 4 https://bugs.webkit.org/show_bug.cgi?id=68918 5 6 Reviewed by Dimitri Glazkov. 7 8 This was a copy/paste error when I refactored this classes to share 9 more code. 10 11 * BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/controllers.js: 12 1 13 2011-09-27 Ryosuke Niwa <rniwa@webkit.org> 2 14
Note: See TracChangeset
for help on using the changeset viewer.