Group flakiness results by blink revision

Tools/TestResultServer/static-dashboards/flakiness_dashboard.js

 // Copyright (C) 2012 Google Inc. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 // notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 // copyright notice, this list of conditions and the following disclaimer
@@ skipping 524 matching lines @@
 
     html += '</ul>';
     ui.popup.show(e.target, html);
 }
 
 function classNameForFailureString(failure)
 {
     return failure.replace(/(\+|\ )/, '');
 }
 
-function htmlForTestResults(test)
+function htmlForTestResults(test, blinkRevisions)
 {
     var html = '';
     var testResults = test.rawResults.concat();
     var times = test.rawTimes.concat();
     var builder = test.builder;
     var master = builders.master(builder);
     var buildNumbers = g_resultsByBuilder[builder].buildNumbers;
 
+    var cells = [];
+    for (var idx = 0; idx < blinkRevisions.length; idx++)

[ojan, 2014/06/29 03:38:49]

nit: s/idx/index

[pdr., 2014/06/29 20:51:34]

Done.

+        cells.push({revision: blinkRevisions[idx]});
+
     var indexToReplaceCurrentResult = -1;
     var indexToReplaceCurrentTime = -1;
     for (var i = 0; i < buildNumbers.length; i++) {
         var currentResultArray, currentTimeArray, innerHTML, resultString;
 
         if (i > indexToReplaceCurrentResult) {
             currentResultArray = testResults.shift();
             if (currentResultArray) {
                 resultString = g_resultsByBuilder[builder][results.FAILURE_MAP][currentResultArray[results.RLE.VALUE]];
                 indexToReplaceCurrentResult += currentResultArray[results.RLE.LENGTH];
             } else {
                 resultString = results.NO_DATA;
                 indexToReplaceCurrentResult += buildNumbers.length;
             }
         }
 
         if (i > indexToReplaceCurrentTime) {
             currentTimeArray = times.shift();
             var currentTime = 0;
             if (currentResultArray) {
               currentTime = currentTimeArray[results.RLE.VALUE];
               indexToReplaceCurrentTime += currentTimeArray[results.RLE.LENGTH];
             } else
               indexToReplaceCurrentTime += buildNumbers.length;
 
             innerHTML = currentTime || '&nbsp;';
         }
 
-        html += '<td title="' + resultString + '. Click for more info." class="results ' + classNameForFailureString(resultString) +
+        var blink = parseInt(g_resultsByBuilder[builder][results.BLINK_REVISIONS][i], 10);

[ojan, 2014/06/29 03:38:48]

nit: s/blink/blinkRevision

[pdr., 2014/06/29 20:51:34]

Done.

+
+        // Locate the empty cell corresponding to this blink revision.
+        var cellIndex = -1;
+        for (var idx = 0; idx < cells.length && cellIndex == -1; idx++) {

[ojan, 2014/06/29 03:38:49]

I think this would read more straightforward if you got rid of the cellIndex==-1
and instead just put a break inside the if clause below, no?

[pdr., 2014/06/29 20:51:34]

Done.

+            if (cells[idx].revision == blink && !cells[idx].html)
+                cellIndex = idx;
+        }
+
+        cells[cellIndex].className = classNameForFailureString(resultString);
+        cells[cellIndex].html = '<td title="' + resultString + '. Click for more info." class="results ' + cells[cellIndex].className +
           '" onclick=\'showPopupForBuild(event, "' + builder + '",' + i + ',"' + test.test + '")\'>' + innerHTML;
     }
+
+    // Set nextClassName on all cells.

[ojan, 2014/06/29 03:38:49]

Nit: unhelpful comment.

[pdr., 2014/06/29 20:51:34]

Done.

+    for (var idx = 1; idx < cells.length; idx++)
+        cells[idx].nextClassName = cells[idx - 1].className || cells[idx - 1].nextClassName;
+
+    // Set prevClassName on all cells.

[ojan, 2014/06/29 03:38:49]

Nit: unhelpful comment.

[pdr., 2014/06/29 20:51:34]

Done.

+    for (var idx = cells.length - 2; idx >= 0; --idx)
+        cells[idx].prevClassName = cells[idx + 1].className || cells[idx + 1].prevClassName;
+
+    var numResultsToShow = buildNumbers.length;
+    for (var idx = cells.length - 1; idx >= (cells.length - numResultsToShow); --idx) {
+        if (cells[idx].html) {
+            html += cells[idx].html;
+        } else {
+            if (cells[idx].nextClassName == cells[idx].prevClassName)
+                html += '<td class="interpolatedResults results ' + cells[idx].nextClassName + '">&nbsp;</td>';

[ojan, 2014/06/29 03:38:49]

Should put a title on these so people can understand what they are from the
tooltip.

[pdr., 2014/06/29 20:51:34]

Done.

+            else
+                html += '<td>&nbsp;</td>';
+        }
+    }
     return html;
 }
 
 function shouldShowTest(testResult)
 {
     if (!g_history.isLayoutTestResults())
         return true;
 
     if (testResult.expectations == 'WONTFIX')
         return g_history.dashboardSpecificState.showWontFix;
@@ skipping 47 matching lines @@
         var bugHtml;
         if (string.startsWith(bug, 'Bug('))
             bugHtml = bug;
         else
             bugHtml = '<a href="http://' + bug + '">' + bug + '</a>';
         html += '<div>' + bugHtml + '</div>'
     });
     return html;
 }
 
-function htmlForSingleTestRow(test, showBuilderNames)
+function htmlForSingleTestRow(test, showBuilderNames, revisions)
 {
     var headers = tableHeaders();
     var html = '';
     for (var i = 0; i < headers.length; i++) {
         var header = headers[i];
         if (string.startsWith(header, 'test') || string.startsWith(header, 'builder')) {
             var testCellClassName = 'test-link' + (showBuilderNames ? ' builder-name' : '');
             var testCellHTML = showBuilderNames ? test.builder : '<span class="link" onclick="g_history.setQueryParameter(\'tests\',\'' + test.test +'\');">' + test.test + '</span>';
             html += '<tr><td class="' + testCellClassName + '">' + testCellHTML;
         } else if (string.startsWith(header, 'bugs'))
             // FIXME: linkify bugs.
             html += '<td class=options-container>' + (linkifyBugs(test.bugs) || createBugHTML(test));
         else if (string.startsWith(header, 'expectations'))
             html += '<td class=options-container>' + test.expectations;
         else if (string.startsWith(header, 'slowest'))
             html += '<td>' + (test.slowestTime ? test.slowestTime + 's' : '');
         else if (string.startsWith(header, 'flakiness'))
-            html += htmlForTestResults(test);
+            html += htmlForTestResults(test, revisions);
     }
     return html;
 }
 
 function sortColumnFromTableHeader(headerText)
 {
     return headerText.split(' ', 1)[0];
 }
 
 function htmlForTableColumnHeader(headerName, opt_fillColSpan)
@@ skipping 95 matching lines @@
         sortFunctionGetter = numericSort;
         resultsProperty = 'slowestTime';
     } else {
         sortFunctionGetter = alphanumericCompare;
         resultsProperty = column;
     }
 
     tests.sort(sortFunctionGetter(resultsProperty, order == BACKWARD));
 }
 
+// Return an array of unique blink build revisions across all builders.
+// The array contains blink revisions but note that these revisions may not be
+// unique: builds of blink@r123,chrome@r567 and blink@r123,chrome@r568 will
+// result in two entries of 123 in the returned array.
+function blinkBuildRevisions(testResults)
+{
+    var revisionsCountedSet = {};
+    for (var j = 0; j < testResults.length; j++) {
+        var builder = testResults[j].builder;
+        var build = g_resultsByBuilder[builder];
+        var buildNumbers = build.buildNumbers;
+        var builderRevisionsCountedSet = {};
+        for (var i = 0; i < buildNumbers.length; i++) {
+            var blinkRevision = build[results.BLINK_REVISIONS][i];
+            builderRevisionsCountedSet[blinkRevision] = (builderRevisionsCountedSet[blinkRevision] || 0) + 1;
+        }
+
+        // Join the builder's revisions with the total revisions for all builders.
+        for (var revision in builderRevisionsCountedSet)
+            revisionsCountedSet[revision] = Math.max(revisionsCountedSet[revision] || 0, builderRevisionsCountedSet[revision]);
+    }
+
+    var revisionsArray = [];
+    for (var revision in revisionsCountedSet) {
+        for (var i = revisionsCountedSet[revision] - 1; i >= 0; --i)
+            revisionsArray.push(revision);
+    }
+
+    revisionsArray.sort(function(a, b) {
+        return (a - b);
+    });
+    return revisionsArray;
+}
+
 function htmlForIndividualTestOnAllBuilders(test)
 {
     processTestRunsForAllBuilders();
 
     var testResults = g_testToResultsMap[test];
     if (!testResults)
         return '<div class="not-found">Test not found. Either it does not exist, is skipped or passes on all recorded runs.</div>';
 
     var html = '';
     var shownBuilders = [];
+    var blinkRevisions = blinkBuildRevisions(testResults);
     for (var j = 0; j < testResults.length; j++) {
         shownBuilders.push(testResults[j].builder);
         var showBuilderNames = true;
-        html += htmlForSingleTestRow(testResults[j], showBuilderNames);
+        html += htmlForSingleTestRow(testResults[j], showBuilderNames, blinkRevisions);
     }
 
     var skippedBuilders = []
     for (builder in currentBuilders()) {
         if (shownBuilders.indexOf(builder) == -1)
             skippedBuilders.push(builder);
     }
 
     var skippedBuildersHtml = '';
     if (skippedBuilders.length) {
@@ skipping 444 matching lines @@
 {
     processTestRunsForBuilder(builderName);
 
     var filteredResults = g_perBuilderFailures[builderName].filter(shouldShowTest);
     sortTests(filteredResults, g_history.dashboardSpecificState.sortColumn, g_history.dashboardSpecificState.sortOrder);
 
     var testsHTML = '';
     if (filteredResults.length) {
         var tableRowsHTML = '';
         var showBuilderNames = false;
+        var blinkRevisions = blinkBuildRevisions(testResults);
         for (var i = 0; i < filteredResults.length; i++)
-            tableRowsHTML += htmlForSingleTestRow(filteredResults[i], showBuilderNames)
+            tableRowsHTML += htmlForSingleTestRow(filteredResults[i], showBuilderNames, blinkRevisions)
         testsHTML = htmlForTestTable(tableRowsHTML);
     } else {
         if (g_history.isLayoutTestResults())
             testsHTML += '<div>Fill in one of the text inputs or checkboxes above to show failures.</div>';
         else
             testsHTML += '<div>No tests have failed!</div>';
     }
 
     var html = htmlForNavBar();
 
@@ skipping 104 matching lines @@
         // escape key
         hideLegend();
         ui.popup.hide();
     }
 }, false);
 
 window.addEventListener('load', function() {
     resourceLoader = new loader.Loader();
     resourceLoader.load();
 }, false);