build.webkit.org/dashboard incorrectly shows interrupted builds as green

https://bugs.webkit.org/show_bug.cgi?id=122732

Reviewed by Tim Hatcher.

* BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotIteration.js:
(BuildbotIteration.prototype.update): Removed a special case for status 4 (EXCEPTION).
I don't see it occur any time in recent history, but judging from what happens for
status 5 (RETRY), we can just finish this function normally.
Record overall text description for iteration as BuildbotIteration.text.

* BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotTesterQueueView.js:
(BuildbotTesterQueueView.prototype.update.appendBuilderQueueStatus): If an iteration is a failure,
but no tests failed, make it yellow, and use buildbot-provided description for it.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@157386 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotIteration.js b/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotIteration.js
index 9035fd6..9710bf1 100644 (file)
--- a/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotIteration.js
+++ b/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotIteration.js
@@ -78,11 +78,6 @@ BuildbotIteration.prototype = {
             if (!testStep)
                 return null;
 
-            if (testStep.results[0] === 4) {
-                // This build step was interrupted (perhaps due to the build slave restarting).
-                return null;
-            }
-
             var testResults = {};
 
             if (!testStep.isFinished) {
@@ -160,8 +155,12 @@ BuildbotIteration.prototype = {
 
             this.loaded = true;
 
+            // Results values (same for the iteration and for each of its steps):
+            // SUCCESS: 0, WARNINGS: 1, FAILURE: 2, SKIPPED: 3, EXCEPTION: 4, RETRY: 5.
             this.failed = !!data.results;
 
+            this.text = data.text.join(" ");
+
             if (!data.currentStep)
                 this.finished = true;
 

diff --git a/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotTesterQueueView.js b/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotTesterQueueView.js
index a4b41af..b7d716c 100644 (file)
--- a/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotTesterQueueView.js
+++ b/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotTesterQueueView.js
@@ -70,9 +70,13 @@ BuildbotTesterQueueView.prototype = {
                 var perlTestResults = iteration.perlTestResults || {failureCount: 0};
                 var bindingTestResults = iteration.bindingTestResults || {errorOccurred: false};
 
-                if (!layoutTestResults.failureCount && !javascriptTestResults.failureCount && !apiTestResults.failureCount && !pythonTestResults.failureCount && !perlTestResults.failureCount && !bindingTestResults.errorOccurred) {
+                if (!iteration.failed) {
                     var status = new StatusLineView(messageLinkElement, StatusLineView.Status.Good, "all tests passed");
                     limit = 0;
+                } else if (!layoutTestResults.failureCount && !javascriptTestResults.failureCount && !apiTestResults.failureCount && !pythonTestResults.failureCount && !perlTestResults.failureCount && !bindingTestResults.errorOccurred) {
+                    // Something wrong happened, but it was not a test failure.
+                    var url = iteration.queue.buildbot.buildPageURLForIteration(iteration);
+                    var status = new StatusLineView(messageLinkElement, StatusLineView.Status.Danger, iteration.text, undefined, url);
                 } else if (layoutTestResults.failureCount && !javascriptTestResults.failureCount && !apiTestResults.failureCount && !pythonTestResults.failureCount && !perlTestResults.failureCount && !bindingTestResults.errorOccurred) {
                     var url = iteration.queue.buildbot.layoutTestResultsURLForIteration(iteration);
                     var status = new StatusLineView(messageLinkElement, StatusLineView.Status.Bad, layoutTestResults.failureCount === 1 ? "layout test failure" : "layout test failures", layoutTestResults.tooManyFailures ? layoutTestResults.failureCount + "\uff0b" : layoutTestResults.failureCount, url);

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 21d362e..da85c4d 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,5 +1,22 @@
 2013-10-13  Alexey Proskuryakov  <ap@apple.com>
 
+        build.webkit.org/dashboard incorrectly shows interrupted builds as green
+        https://bugs.webkit.org/show_bug.cgi?id=122732
+
+        Reviewed by Tim Hatcher.
+
+        * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotIteration.js:
+        (BuildbotIteration.prototype.update): Removed a special case for status 4 (EXCEPTION).
+        I don't see it occur any time in recent history, but judging from what happens for
+        status 5 (RETRY), we can just finish this function normally.
+        Record overall text description for iteration as BuildbotIteration.text.
+
+        * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotTesterQueueView.js:
+        (BuildbotTesterQueueView.prototype.update.appendBuilderQueueStatus): If an iteration is a failure,
+        but no tests failed, make it yellow, and use buildbot-provided description for it.
+
+2013-10-13  Alexey Proskuryakov  <ap@apple.com>
+
         Remove Chromium specific code from flakiness dashboard
         https://bugs.webkit.org/show_bug.cgi?id=122714