Changeset 96153 in webkit


Ignore:
Timestamp:
Sep 27, 2011 2:02:34 PM (13 years ago)
Author:
abarth@webkit.org
Message:

garden-o-matic examine buttons shows both expected and unexpected failures
https://bugs.webkit.org/show_bug.cgi?id=68918

Reviewed by Dimitri Glazkov.

This was a copy/paste error when I refactored this classes to share
more code.

  • BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/controllers.js:
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  
    6666<script src="scripts/ui/notifications.js"></script>
    6767<script src="scripts/ui/notifications_unittests.js"></script>
     68<script src="scripts/controllers_unittests.js"></script>
    6869
    6970<!-- FIXME: We should have tests for these files! -->
  • trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/controllers.js

    r95069 r96153  
    101101    _createFailureView: function(failureAnalysis) { throw "Not implemented!"; },
    102102
    103     init: function(view)
    104     {
     103    init: function(model, view, delegate)
     104    {
     105        this._model = model;
    105106        this._view = view;
     107        this._delegate = delegate;
    106108        this._testFailures = new base.UpdateTracker();
    107109    },
     
    140142        var testNameList = failures.testNameList();
    141143        var failuresByTest = base.filterDictionary(
    142             this._resultsFilter(model.state.resultsByBuilder),
     144            this._resultsFilter(this._model.resultsByBuilder),
    143145            function(key) {
    144146                return testNameList.indexOf(key) != -1;
     
    146148
    147149        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);
    154151    },
    155152    _toFailureInfoList: function(failures)
     
    168165
    169166controllers.UnexpectedFailures = base.extends(FailureStreamController, {
    170     _resultsFilter: results.expectedOrUnexpectedFailuresByTest,
     167    _resultsFilter: results.unexpectedFailuresByTest,
    171168
    172169    _impliedFirstFailingRevision: function(failureAnalysis)
  • trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/garden-o-matic.js

    r95069 r96153  
    6161    onebar.attach();
    6262
     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
    6373    var unexpectedFailuresView = new ui.notifications.Stream();
    64     g_unexpectedFailuresController = new controllers.UnexpectedFailures(unexpectedFailuresView);
     74    g_unexpectedFailuresController = new controllers.UnexpectedFailures(model.state, unexpectedFailuresView, onebarController);
    6575
    6676    var failuresView = new ui.notifications.Stream();
    67     g_failuresController = new controllers.Failures(failuresView);
     77    g_failuresController = new controllers.Failures(model.state, failuresView, onebarController);
    6878
    6979    g_info = new ui.notifications.Stream();
  • trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/results_unittests.js

    r94486 r96153  
    2424 */
    2525
     26var unittest = unittest || {};
     27
    2628(function () {
    2729
    2830module("results");
    2931
    30 var kExampleResultsJSON = {
     32unittest.kExampleResultsJSON = {
    3133    "tests": {
    3234        "scrollbars": {
     
    7072
    7173test("unexpectedFailures", 1, function() {
    72     var unexpectedFailures = results.unexpectedFailures(kExampleResultsJSON);
     74    var unexpectedFailures = results.unexpectedFailures(unittest.kExampleResultsJSON);
    7375    deepEqual(unexpectedFailures, {
    7476        "userscripts/another-test.html": {
     
    8183test("unexpectedFailuresByTest", 1, function() {
    8284    var unexpectedFailuresByTest = results.unexpectedFailuresByTest({
    83         "Mock Builder": kExampleResultsJSON
     85        "Mock Builder": unittest.kExampleResultsJSON
    8486    });
    8587    deepEqual(unexpectedFailuresByTest, {
     
    9597test("unexpectedSuccessesByTest", 1, function() {
    9698    var unexpectedFailuresByTest = results.unexpectedSuccessesByTest({
    97         "Mock Builder": kExampleResultsJSON
     99        "Mock Builder": unittest.kExampleResultsJSON
    98100    });
    99101    deepEqual(unexpectedFailuresByTest, {
     
    109111test("failureInfoForTestAndBuilder", 1, function() {
    110112    var unexpectedFailuresByTest = results.unexpectedFailuresByTest({
    111         "Mock Builder": kExampleResultsJSON
     113        "Mock Builder": unittest.kExampleResultsJSON
    112114    });
    113115    var failureInfo = results.failureInfoForTestAndBuilder(unexpectedFailuresByTest, "userscripts/another-test.html", "Mock Builder");
     
    150152
    151153test("resultNodeForTest", 4, function() {
    152     deepEqual(results.resultNodeForTest(kExampleResultsJSON, "userscripts/another-test.html"), {
     154    deepEqual(results.resultNodeForTest(unittest.kExampleResultsJSON, "userscripts/another-test.html"), {
    153155        "expected": "PASS",
    154156        "actual": "TEXT"
    155157    });
    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);
    159161});
    160162
  • trunk/Tools/ChangeLog

    r96148 r96153  
     12011-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
    1132011-09-27  Ryosuke Niwa  <rniwa@webkit.org>
    214
Note: See TracChangeset for help on using the changeset viewer.