<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[195690] trunk/Tools</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/195690">195690</a></dd>
<dt>Author</dt> <dd>jmarcell@apple.com</dd>
<dt>Date</dt> <dd>2016-01-27 14:04:58 -0800 (Wed, 27 Jan 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix bugs caused by incorrect usage of "branch" vs. "branchName". https://bugs.webkit.org/show_bug.cgi?id=153330
Reviewed by Daniel Bates.
In an earlier patch we started using the name "branch" to indicate a branch object, whereas
"branchName" implies that the variable or property in question is simply a string. We fixed some
inconsistencies regarding this issue in 152982 but further bugs and inconsistencies were recently
spotted in BuildbotQueueView.js.
* BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotQueueView.js:
(BuildbotQueueView.prototype._popoverLinesForCommitRange): Change branchName to branch in method signature.
Changed branchName to branch.name in call to commitsOnBranch.
(BuildbotQueueView.prototype._presentPopoverForPendingCommits): Change branch.name to branch in call to
_popoverLinesForCommitRange.
(BuildbotQueueView.prototype._presentPopoverForRevisionRange): Changed context.branchName to context.branch.name.
(BuildbotQueueView.prototype._revisionContentWithPopoverForIteration): Changed branch.name to branch.
* BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/tests/tests.js: Added tests to verify
fix.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsBuildSlaveSupportbuildwebkitorgconfigpublic_htmldashboardScriptsBuildbotQueueViewjs">trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotQueueView.js</a></li>
<li><a href="#trunkToolsBuildSlaveSupportbuildwebkitorgconfigpublic_htmldashboardScriptsteststestsjs">trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/tests/tests.js</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsBuildSlaveSupportbuildwebkitorgconfigpublic_htmldashboardScriptsBuildbotQueueViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotQueueView.js (195689 => 195690)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotQueueView.js 2016-01-27 21:57:22 UTC (rev 195689)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotQueueView.js 2016-01-27 22:04:58 UTC (rev 195690)
</span><span class="lines">@@ -110,7 +110,7 @@
</span><span class="cx"> new PopoverTracker(messageElement, this._presentPopoverForPendingCommits.bind(this), queue);
</span><span class="cx"> },
</span><span class="cx">
</span><del>- _popoverLinesForCommitRange: function(trac, branchName, firstRevisionNumber, lastRevisionNumber)
</del><ins>+ _popoverLinesForCommitRange: function(trac, branch, firstRevisionNumber, lastRevisionNumber)
</ins><span class="cx"> {
</span><span class="cx"> function lineForCommit(trac, commit)
</span><span class="cx"> {
</span><span class="lines">@@ -141,7 +141,7 @@
</span><span class="cx">
</span><span class="cx"> // FIXME: To be 100% correct, we should also filter out changes that are ignored by
</span><span class="cx"> // the queue, see _should_file_trigger_build in wkbuild.py.
</span><del>- var commits = trac.commitsOnBranch(branchName, function(commit) { return commit.revisionNumber >= firstRevisionNumber && commit.revisionNumber <= lastRevisionNumber; });
</del><ins>+ var commits = trac.commitsOnBranch(branch.name, function(commit) { return commit.revisionNumber >= firstRevisionNumber && commit.revisionNumber <= lastRevisionNumber; });
</ins><span class="cx"> return commits.map(function(commit) {
</span><span class="cx"> return lineForCommit(trac, commit);
</span><span class="cx"> }, this).reverse();
</span><span class="lines">@@ -166,7 +166,7 @@
</span><span class="cx"> var latestProductiveRevisionNumber = latestProductiveIteration.revision[repositoryName];
</span><span class="cx"> if (!latestProductiveRevisionNumber || !trac.latestRecordedRevisionNumber)
</span><span class="cx"> continue;
</span><del>- var lines = this._popoverLinesForCommitRange(trac, branch.name, latestProductiveRevisionNumber + 1, trac.latestRecordedRevisionNumber);
</del><ins>+ var lines = this._popoverLinesForCommitRange(trac, branch, latestProductiveRevisionNumber + 1, trac.latestRecordedRevisionNumber);
</ins><span class="cx"> var length = lines.length;
</span><span class="cx"> if (length && shouldAddDivider)
</span><span class="cx"> this._addDividerToPopover(content);
</span><span class="lines">@@ -188,7 +188,7 @@
</span><span class="cx"> content.className = "commit-history-popover";
</span><span class="cx">
</span><span class="cx"> // FIXME: Nothing guarantees that Trac has historical data for these revisions.
</span><del>- var linesForCommits = this._popoverLinesForCommitRange(context.trac, context.branchName, context.firstRevision, context.lastRevision);
</del><ins>+ var linesForCommits = this._popoverLinesForCommitRange(context.trac, context.branch, context.firstRevision, context.lastRevision);
</ins><span class="cx">
</span><span class="cx"> var line = document.createElement("div");
</span><span class="cx"> line.className = "title";
</span><span class="lines">@@ -198,7 +198,7 @@
</span><span class="cx"> content.appendChild(line);
</span><span class="cx"> this._addDividerToPopover(content);
</span><span class="cx"> } else {
</span><del>- line.textContent = "no commits to " + context.branchName + " since previous result";
</del><ins>+ line.textContent = "no commits to " + context.branch.name + " since previous result";
</ins><span class="cx"> content.appendChild(line);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -232,7 +232,7 @@
</span><span class="cx"> console.assert(previousIteration.revision[repositoryName]);
</span><span class="cx"> var context = {
</span><span class="cx"> trac: repository.trac,
</span><del>- branchName: branch.name,
</del><ins>+ branch: branch,
</ins><span class="cx"> firstRevision: previousIteration.revision[repositoryName] + 1,
</span><span class="cx"> lastRevision: iteration.revision[repositoryName]
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkToolsBuildSlaveSupportbuildwebkitorgconfigpublic_htmldashboardScriptsteststestsjs"></a>
<div class="modfile"><h4>Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/tests/tests.js (195689 => 195690)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/tests/tests.js 2016-01-27 21:57:22 UTC (rev 195689)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/tests/tests.js 2016-01-27 22:04:58 UTC (rev 195690)
</span><span class="lines">@@ -54,26 +54,101 @@
</span><span class="cx"> strictEqual(this.trac._parseRevisionFromURL("https://git.foobar.com/trac/Whatever.git/changeset/0e498db5d8e5b5a342631"), "0e498db5d8e5b5a342631", "Git");
</span><span class="cx"> });
</span><span class="cx">
</span><del>-module("BuildBotQueueView");
</del><ins>+module("BuildBotQueueView", {
+ setup: function() {
+ this.trac = new MockTrac();
+ this.queue = new MockBuildbotQueue();
+ this.trunkBranch = {
+ name: "trunk",
+ repository: {
+ name: "openSource",
+ trac: this.trac,
+ isSVN: true,
+ }
+ };
+ this.queue.branches = [this.trunkBranch];
+ this.view = new MockBuildbotQueueView([this.queue]);
+ }
+});
</ins><span class="cx">
</span><span class="cx"> var settings = new Settings;
</span><span class="cx"> test("_appendPendingRevisionCount", function()
</span><span class="cx"> {
</span><del>- trac = new MockTrac();
- var queue = new MockBuildbotQueue();
- queue.branches = [{
- name: "trunk",
- repository: {
- name: "openSource",
- trac: trac
- }
- }]
- var view = new MockBuildbotQueueView([queue]);
- view._appendPendingRevisionCount(queue);
- var revisionsBehind = view.element.getElementsByClassName("message")[0].innerHTML.match(/.*(\d+) revision(|s) behind/)[1];
</del><ins>+ this.view._appendPendingRevisionCount(this.queue);
+ var revisionsBehind = this.view.element.getElementsByClassName("message")[0].innerHTML.match(/.*(\d+) revision(|s) behind/)[1];
</ins><span class="cx"> equal(revisionsBehind, "1", "assert revisions behind");
</span><span class="cx"> });
</span><span class="cx">
</span><ins>+test("_popoverLinesForCommitRange", function()
+{
+ var lines = this.view._popoverLinesForCommitRange(this.trac, this.trunkBranch, 33018, 33020);
+ strictEqual(lines.length, 3, "has 3 lines");
+});
+
+test("_presentPopoverForPendingCommits", function()
+{
+ var element = document.createElement("div");
+ var popover = new Dashboard.Popover();
+ this.view._presentPopoverForPendingCommits(element, popover, this.queue);
+ var nodeList = popover._element.getElementsByClassName("pending-commit");
+ strictEqual(nodeList.length, 1, "has 1 pending commit");
+});
+
+test("_presentPopoverForRevisionRange", function()
+{
+ var element = document.createElement("div");
+ var popover = new Dashboard.Popover();
+ var context = {
+ trac: this.trac,
+ branch: this.trunkBranch,
+ firstRevision: 33018,
+ lastRevision: 33020
+ };
+ this.view._presentPopoverForRevisionRange(element, popover, context);
+ var nodeList = popover._element.getElementsByClassName("pending-commit");
+ strictEqual(nodeList.length, 3, "has 3 commits");
+});
+
+test("_presentPopoverForRevisionRange no commits", function()
+{
+ var element = document.createElement("div");
+ var popover = new Dashboard.Popover();
+ var context = {
+ trac: this.trac,
+ branch: this.trunkBranch,
+ firstRevision: 33020,
+ lastRevision: 33018
+ };
+ this.view._presentPopoverForRevisionRange(element, popover, context);
+ var nodeList = popover._element.getElementsByClassName("pending-commit");
+ strictEqual(nodeList.length, 0, "has 0 commits");
+});
+
+test("_revisionContentWithPopoverForIteration", function()
+{
+ var finished = false;
+ var iteration = new BuildbotIteration(this.queue, 1, finished);
+ iteration.revision = { "openSource": 33018 };
+ var previousIteration = null;
+ var content = this.view._revisionContentWithPopoverForIteration(iteration, previousIteration, this.trunkBranch);
+ strictEqual(content.innerHTML, "r33018", "should have correct revision number.");
+ strictEqual(content.classList.contains("revision-number"), true, "should have class 'revision-number'.");
+ strictEqual(content.classList.contains("popover-tracking"), false, "should not have class 'popover-tracking'.");
+});
+
+test("_revisionContentWithPopoverForIteration has previousIteration", function()
+{
+ var finished = false;
+ var iteration = new BuildbotIteration(this.queue, 2, finished);
+ iteration.revision = { "openSource": 33022 };
+ var previousIteration = new BuildbotIteration(this.queue, 1, finished);
+ previousIteration.revision = { "openSource": 33018 };
+ var content = this.view._revisionContentWithPopoverForIteration(iteration, previousIteration, this.trunkBranch);
+ strictEqual(content.innerHTML, "r33022", "should have correct revision number.");
+ strictEqual(content.classList.contains("revision-number"), true, "should have class 'revision-number'.");
+ strictEqual(content.classList.contains("popover-tracking"), true, "should have class 'popover-tracking'.");
+});
+
</ins><span class="cx"> module("BuildBotQueue", {
</span><span class="cx"> setup: function() {
</span><span class="cx"> this.queue = new MockBuildbotQueue();
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (195689 => 195690)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2016-01-27 21:57:22 UTC (rev 195689)
+++ trunk/Tools/ChangeLog 2016-01-27 22:04:58 UTC (rev 195690)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2016-01-27 Jason Marcell <jmarcell@apple.com>
+
+ Fix bugs caused by incorrect usage of "branch" vs. "branchName".
+ https://bugs.webkit.org/show_bug.cgi?id=153330
+
+ Reviewed by Daniel Bates.
+
+ In an earlier patch we started using the name "branch" to indicate a branch object, whereas
+ "branchName" implies that the variable or property in question is simply a string. We fixed some
+ inconsistencies regarding this issue in 152982 but further bugs and inconsistencies were recently
+ spotted in BuildbotQueueView.js.
+
+ * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotQueueView.js:
+ (BuildbotQueueView.prototype._popoverLinesForCommitRange): Change branchName to branch in method signature.
+ Changed branchName to branch.name in call to commitsOnBranch.
+ (BuildbotQueueView.prototype._presentPopoverForPendingCommits): Change branch.name to branch in call to
+ _popoverLinesForCommitRange.
+ (BuildbotQueueView.prototype._presentPopoverForRevisionRange): Changed context.branchName to context.branch.name.
+ (BuildbotQueueView.prototype._revisionContentWithPopoverForIteration): Changed branch.name to branch.
+ * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/tests/tests.js: Added tests to verify
+ fix.
+
</ins><span class="cx"> 2016-01-27 Ryosuke Niwa <rniwa@webkit.org>
</span><span class="cx">
</span><span class="cx"> Add API to access closed shadowRoot in InjectedBundle
</span></span></pre>
</div>
</div>
</body>
</html>