Changeset 94540 in webkit

Timestamp:

Sep 5, 2011 4:18:00 PM (13 years ago)

Author:

abarth@webkit.org

Message:

Add a tab to garden-o-matic for viewing expected failures
​https://bugs.webkit.org/show_bug.cgi?id=67619

Reviewed by Dimitri Glazkov.

This patch adds a basic tab to garden-o-matic that shows all the tests
failing on the bots, including the expected failures. This patch
mostly involves refactoring existing classes to allow new subclasses.

This view is useful for when gardeners mark tests as expected to fail
and then rebaseline them later.

• BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/controllers.js:
• BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/garden-o-matic.js:
• BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/model.js:
• BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/summary-mock.js:
• BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/ui.js:
• BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/ui/notifications.js:
• BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/ui/notifications_unittests.js:

Location:

trunk/Tools

Files:

• BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/controllers.js (modified) (6 diffs)
• BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/garden-o-matic.js (modified) (4 diffs)
• BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/model.js (modified) (1 diff)
• BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/summary-mock.js (modified) (3 diffs)
• BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/ui.js (modified) (2 diffs)
• BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/ui/notifications.js (modified) (5 diffs)
• BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/ui/notifications_unittests.js (modified) (2 diffs)
• ChangeLog (modified) (1 diff)

trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/controllers.js

@@ -68 +68 @@
 });
 
-controllers.UnexpectedFailures = base.extends(Object, {
+var FailureStreamController = base.extends(Object, {
+    _resultsFilter: null,
+    _keyFor: function(failureAnalysis) { throw "Not implemented!"; },
+    _createFailureView: function(failureAnalysis) { throw "Not implemented!"; },
+
     init: function(view)
     {
@@ -76 +80 @@
     update: function(failureAnalysis)
     {
-        var key = failureAnalysis.newestPassingRevision + "+" + failureAnalysis.oldestFailingRevision;
+        var key = this._keyFor(failureAnalysis);
         var failure = this._testFailures.get(key);
-        var impliedFirstFailingRevision = failureAnalysis.newestPassingRevision + 1;
         if (!failure) {
-            failure = new ui.notifications.TestsFailing();
-            model.commitDataListForRevisionRange(impliedFirstFailingRevision, failureAnalysis.oldestFailingRevision).forEach(function(commitData) {
-                var suspiciousCommit = failure.addCommitData(commitData);
-                $(suspiciousCommit).bind('rollout', function() {
-                    this.onRollout(commitData.revision, failure.testNameList());
-                }.bind(this));
-                $(failure).bind('blame', function() {
-                    this.onBlame(failure, commitData);
-                }.bind(this));
-            }, this);
+            failure = this._createFailureView(failureAnalysis);
             this._view.add(failure);
             $(failure).bind('examine', function() {
@@ -99 +93 @@
         }
         failure.addFailureAnalysis(failureAnalysis);
-        failure.updateBuilderResults(model.buildersInFlightForRevision(impliedFirstFailingRevision));
         this._testFailures.update(key, failure);
+        return failure;
     },
     purge: function() {
@@ -115 +109 @@
         var testNameList = failures.testNameList();
         var failuresByTest = base.filterDictionary(
-            results.unexpectedFailuresByTest(model.state.resultsByBuilder),
+            this._resultsFilter(model.state.resultsByBuilder),
             function(key) {
                 return testNameList.indexOf(key) != -1;
@@ -136 +130 @@
             alert('Rebaseline done! Please land with "webkit-patch land-cowboy".');
         });
+    }
+});
+
+controllers.UnexpectedFailures = base.extends(FailureStreamController, {
+    _resultsFilter: results.expectedOrUnexpectedFailuresByTest,
+
+    _impliedFirstFailingRevision: function(failureAnalysis)
+    {
+        return failureAnalysis.newestPassingRevision + 1;
+    },
+    _keyFor: function(failureAnalysis)
+    {
+        return failureAnalysis.newestPassingRevision + "+" + failureAnalysis.oldestFailingRevision;
+    },
+    _createFailureView: function(failureAnalysis)
+    {
+        var failure = new ui.notifications.FailingTestsSummary();
+        model.commitDataListForRevisionRange(this._impliedFirstFailingRevision(failureAnalysis), failureAnalysis.oldestFailingRevision).forEach(function(commitData) {
+            var suspiciousCommit = failure.addCommitData(commitData);
+            $(suspiciousCommit).bind('rollout', function() {
+                this.onRollout(commitData.revision, failure.testNameList());
+            }.bind(this));
+            $(failure).bind('blame', function() {
+                this.onBlame(failure, commitData);
+            }.bind(this));
+        }, this);
+
+        return failure;
+    },
+    update: function(failureAnalysis)
+    {
+        var failure = FailureStreamController.prototype.update.call(this, failureAnalysis);
+        failure.updateBuilderResults(model.buildersInFlightForRevision(this._impliedFirstFailingRevision(failureAnalysis)));
     },
     onBlame: function(failure, commitData)
@@ -150 +177 @@
         checkout.rollout(revision, ui.rolloutReasonForTestNameList(testNameList), $.noop);
     }
+});
+
+controllers.Failures = base.extends(FailureStreamController, {
+    _resultsFilter: results.expectedOrUnexpectedFailuresByTest,
+
+    _keyFor: function(failureAnalysis)
+    {
+        return base.dirName(failureAnalysis.testName);
+    },
+    _createFailureView: function(failureAnalysis)
+    {
+        return new ui.notifications.FailingTests();
+    },
 });
 

trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/garden-o-matic.js

@@ -31 +31 @@
 var g_buildersFailing = null;
 
-var g_unexpectedFailures = null;
+var g_unexpectedFailuresController = null;
+var g_failuresController = null;
+
 var g_failingBuilders = null;
 
@@ -44 +46 @@
 
     base.callInParallel([model.updateRecentCommits, model.updateResultsByBuilder], function() {
-        model.analyzeUnexpectedFailures(g_unexpectedFailures.update.bind(g_unexpectedFailures), function() {
-            g_unexpectedFailures.purge();
+        model.analyzeUnexpectedFailures(g_unexpectedFailuresController.update.bind(g_unexpectedFailuresController), function() {
+            g_unexpectedFailuresController.purge();
             updating.dismiss();
         });
+
+        model.analyzeExpectedOrUnexpectedFailures(g_failuresController.update.bind(g_failuresController));
     });
 }
@@ -61 +65 @@
     onebar.attach();
 
-    var actions = new ui.notifications.Stream();
-    g_unexpectedFailures = new controllers.UnexpectedFailures(actions);
+    var unexpectedFailuresView = new ui.notifications.Stream();
+    g_unexpectedFailuresController = new controllers.UnexpectedFailures(unexpectedFailuresView);
+
+    var failuresView = new ui.notifications.Stream();
+    g_failuresController = new controllers.Failures(failuresView);
 
     g_info = new ui.notifications.Stream();
@@ -75 +82 @@
     summary.appendChild(updateButton);
     summary.appendChild(g_info);
-    summary.appendChild(actions);
+    summary.appendChild(unexpectedFailuresView);
+
+    var failures = onebar.failures();
+    failures.appendChild(failuresView);
 
     update();

trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/model.js

@@ -208 +208 @@
 };
 
+model.analyzeExpectedOrUnexpectedFailures = function(callback)
+{
+    var expectedFailures = results.expectedOrUnexpectedFailuresByTest(model.state.resultsByBuilder);
+    $.each(expectedFailures, function(testName, resultNodesByBuilder) {
+        var failureAnalysis = {
+            'testName': testName,
+            'resultNodesByBuilder': resultNodesByBuilder,
+        };
+
+        // FIXME: Consider looking at the history to see how long this test
+        // has been failing.
+
+        callback(failureAnalysis);
+    });
+};
+
 })();

trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/summary-mock.js

@@ -117 +117 @@
 var currentMinutesAgo = 0;
 
-function createTestsFailing(commitDataCount, failureAnalysisCount, builderFailureCount)
+function createFailingTestsSummary(commitDataCount, failureAnalysisCount, builderFailureCount)
 {
-    var testsFailing = new ui.notifications.TestsFailing();
+    var failingTestsSummary = new ui.notifications.FailingTestsSummary();
     for (var i = 0; i < commitDataCount; ++i)
-        testsFailing.addCommitData({
+        failingTestsSummary.addCommitData({
             time: minutesAgo(currentMinutesAgo++),
             revision: currentRevision++,
@@ -129 +129 @@
         });
     for (var i = 0; i < failureAnalysisCount; ++i)
-        testsFailing.addFailureAnalysis({
+        failingTestsSummary.addFailureAnalysis({
             testName: testNames.cycle(),
             resultNodesByBuilder: createResultNodesByBuilder(builderFailureCount)
         });
-    return testsFailing;
+    return failingTestsSummary;
 }
 
@@ -155 +155 @@
     button.textContent = 'update';
 
-    actions.add(createTestsFailing(3, 4, 1));
-    actions.add(createTestsFailing(3, 1, 3));
-    actions.add(createTestsFailing(1, 20, 1));
+    actions.add(createFailingTestsSummary(3, 4, 1));
+    actions.add(createFailingTestsSummary(3, 1, 3));
+    actions.add(createFailingTestsSummary(1, 20, 1));
     actions.add(createBuildersFailing(1));
     actions.add(createBuildersFailing(8));

trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/ui.js

@@ -61 +61 @@
                 '<li><a href="#results">Results</a></li>' +
                 '<li><a href="#commits">Commits</a></li>' +
+                '<li><a href="#failures">Failures</a></li>' +
             '</ul>' +
             '<div id="summary"></div>' +
             '<div id="results"></div>' +
-            '<div id="commits">Coming soon...</div>';
+            '<div id="commits">Coming soon...</div>' +
+            '<div id="failures"></div>';
         this._tabNames = [
             'summary',
             'results',
-            'commits,'
+            'commits',
+            'failures',
         ]
         this._tabs = $(this).tabs({
@@ -89 +92 @@
     {
         return this.tabNamed('results');
+    },
+    failures: function()
+    {
+        return this.tabNamed('failures');
     },
     select: function(tabName)

trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/ui/notifications.js

@@ -136 +136 @@
     {
         this._time = this._how.appendChild(new ui.RelativeTime());
-        this._where = this._how.appendChild(new ui.failures.FailureGrid());
         this._problem = this._what.appendChild(document.createElement('div'));
         this._problem.className = 'problem';
@@ -150 +149 @@
 });
 
-ui.notifications.TestsFailing = base.extends(ui.notifications.Failure, {
+ui.notifications.FailingTests = base.extends(ui.notifications.Failure, {
     init: function() {
         // FIXME: Convert actions to a link from test!
@@ -158 +157 @@
         ]));
         this._testNameList = [];
-        this._commitDataPinned = false;
     },
     testNameList: function()
@@ -168 +166 @@
         return this._testNameList.indexOf(failureAnalysis.testName) != -1;
     },
-    updateBuilderResults: function(resultNodesByBuilder)
-    {
-        this._where.add(resultNodesByBuilder);
-    },
     addFailureAnalysis: function(failureAnalysis)
     {
         if (this.containsFailureAnalysis(failureAnalysis))
-            return;
+            return false;
         this._testNameList.push(failureAnalysis.testName);
-        this.updateBuilderResults(failureAnalysis.resultNodesByBuilder);
         $(this._effects).empty();
         this._forEachTestGroup(function (testGroup) {
             this._effects.appendChild(new ui.notifications.FailingTestGroup(testGroup))
         }.bind(this));
-    },
-    pinToCommitData: function(commitData)
-    {
-        if (this._commitDataPinned)
-            return;
-        this._commitDataPinned = true;
-        $(this._causes).children().each(function() {
-            if (this.hasRevision(commitData.revision))
-                return;
-            $(this).detach();
-        });
-    },
-    addCommitData: function(commitData)
-    {
-        if (this._commitDataPinned)
-            return null;
-        var commitDataDate = new Date(commitData.time);
-        if (this._time.date > commitDataDate); {
-            this.setIndex(commitDataDate.getTime());
-            this._time.setDate(commitDataDate);
-        }
-        return this._causes.appendChild(new ui.notifications.SuspiciousCommit(commitData));
+        return true;
     },
     _forEachTestGroup: function(callback)
@@ -227 +199 @@
 });
 
+ui.notifications.FailingTestsSummary = base.extends(ui.notifications.FailingTests, {
+    init: function() {
+        this._where = this._how.appendChild(new ui.failures.FailureGrid());
+        this._commitDataPinned = false;
+    },
+    updateBuilderResults: function(resultNodesByBuilder)
+    {
+        this._where.add(resultNodesByBuilder);
+    },
+    addFailureAnalysis: function(failureAnalysis)
+    {
+        if (!ui.notifications.FailingTests.prototype.addFailureAnalysis.call(this, failureAnalysis))
+            return false;
+        this.updateBuilderResults(failureAnalysis.resultNodesByBuilder);
+    },
+    pinToCommitData: function(commitData)
+    {
+        if (this._commitDataPinned)
+            return;
+        this._commitDataPinned = true;
+        $(this._causes).children().each(function() {
+            if (this.hasRevision(commitData.revision))
+                return;
+            $(this).detach();
+        });
+    },
+    addCommitData: function(commitData)
+    {
+        if (this._commitDataPinned)
+            return null;
+        var commitDataDate = new Date(commitData.time);
+        if (this._time.date > commitDataDate); {
+            this.setIndex(commitDataDate.getTime());
+            this._time.setDate(commitDataDate);
+        }
+        return this._causes.appendChild(new ui.notifications.SuspiciousCommit(commitData));
+    }
+});
+
 ui.notifications.BuildersFailing = base.extends(ui.notifications.Failure, {
     init: function()
     {
         this._problem.insertBefore(document.createTextNode('Build Failed:'), this._problem.firstChild);
-        $(this._where).detach();
     },
     setFailingBuilders: function(builderNameList)
     {
-        // FIXME: Populate this._where with failing builders.
         $(this._effects).empty().append(builderNameList.map(function(builderName) {
             var effect = document.createElement('li');

trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/ui/notifications_unittests.js

@@ -99 +99 @@
 });
 
-test('TestsFailing', 13, function() {
-    var testFailures = new ui.notifications.TestsFailing();
-    deepEqual(Object.getOwnPropertyNames(testFailures.__proto__), [
-        "init",
-        "testNameList",
-        "updateBuilderResults",
-        "addFailureAnalysis",
-        "pinToCommitData",
-        "_forEachTestGroup",
-        "containsFailureAnalysis",
-        "addCommitData"
-    ]);
+test('FailingTestsSummary', 12, function() {
+    var testFailures = new ui.notifications.FailingTestsSummary();
     equal(testFailures.tagName, 'LI');
     equal(testFailures.innerHTML,
@@ -305 +295 @@
 });
 
-test('TestsFailing (grouping)', 1, function() {
-    var testFailures = new ui.notifications.TestsFailing();
+test('FailingTestsSummary (grouping)', 1, function() {
+    var testFailures = new ui.notifications.FailingTestsSummary();
     testFailures.addFailureAnalysis({testName: 'path/to/test1.html', resultNodesByBuilder: {}});
     testFailures.addFailureAnalysis({testName: 'path/to/test2.html', resultNodesByBuilder: {}});

trunk/Tools/ChangeLog

@@ +1 @@
+2011-09-05  Adam Barth  <abarth@webkit.org>
+
+        Add a tab to garden-o-matic for viewing expected failures
+        https://bugs.webkit.org/show_bug.cgi?id=67619
+
+        Reviewed by Dimitri Glazkov.
+
+        This patch adds a basic tab to garden-o-matic that shows all the tests
+        failing on the bots, including the expected failures.  This patch
+        mostly involves refactoring existing classes to allow new subclasses.
+
+        This view is useful for when gardeners mark tests as expected to fail
+        and then rebaseline them later.
+
+        * BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/controllers.js:
+        * BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/garden-o-matic.js:
+        * BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/model.js:
+        * BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/summary-mock.js:
+        * BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/ui.js:
+        * BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/ui/notifications.js:
+        * BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/ui/notifications_unittests.js:
+
 2011-09-05  Adam Barth  <abarth@webkit.org>