<!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>[195391] 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/195391">195391</a></dd>
<dt>Author</dt> <dd>jmarcell@apple.com</dd>
<dt>Date</dt> <dd>2016-01-20 16:20:33 -0800 (Wed, 20 Jan 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Refactor compareIterations to remove duplicate code.
https://bugs.webkit.org/show_bug.cgi?id=152913
Reviewed by Daniel Bates.
* BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotQueue.js:
(BuildbotQueue.prototype.compareIterations): Refactored to remove duplicate code.
(BuildbotQueue.prototype.sortIterations): Add binding to call to compareIterations.
* BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/tests/tests.js: Added tests in order to ensure
the same behavior before and after refactor.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsBuildSlaveSupportbuildwebkitorgconfigpublic_htmldashboardScriptsBuildbotQueuejs">trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotQueue.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_htmldashboardScriptsBuildbotQueuejs"></a>
<div class="modfile"><h4>Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotQueue.js (195390 => 195391)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotQueue.js 2016-01-20 23:40:44 UTC (rev 195390)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotQueue.js 2016-01-21 00:20:33 UTC (rev 195391)
</span><span class="lines">@@ -268,13 +268,9 @@
</span><span class="cx">
</span><span class="cx"> compareIterations: function(a, b)
</span><span class="cx"> {
</span><del>- var sortedRepositories = Dashboard.sortedRepositories;
- for (var i = 0; i < sortedRepositories.length; ++i) {
- var repositoryName = sortedRepositories[i].name;
- var result = b.revision[repositoryName] - a.revision[repositoryName];
- if (result)
- return result;
- }
</del><ins>+ result = this.compareIterationsByRevisions(a, b);
+ if (result)
+ return result;
</ins><span class="cx">
</span><span class="cx"> // A loaded iteration may not have revision numbers if it failed early, before svn steps finished.
</span><span class="cx"> result = b.loaded - a.loaded;
</span><span class="lines">@@ -299,6 +295,6 @@
</span><span class="cx">
</span><span class="cx"> sortIterations: function()
</span><span class="cx"> {
</span><del>- this.iterations.sort(this.compareIterations);
</del><ins>+ this.iterations.sort(this.compareIterations.bind(this));
</ins><span class="cx"> }
</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 (195390 => 195391)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/tests/tests.js 2016-01-20 23:40:44 UTC (rev 195390)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/tests/tests.js 2016-01-21 00:20:33 UTC (rev 195391)
</span><span class="lines">@@ -42,3 +42,97 @@
</span><span class="cx"> var revisionsBehind = view.element.getElementsByClassName("message")[0].innerHTML.match(/.*(\d+) revision(|s) behind/)[1];
</span><span class="cx"> equal(revisionsBehind, "1", "assert revisions behind");
</span><span class="cx"> });
</span><ins>+
+module("BuildBotQueue", {
+ setup: function() {
+ this.queue = new MockBuildbotQueue();
+ this.queue.branches = [{
+ name: "trunk",
+ repository: {
+ name: "openSource",
+ }
+ }];
+ }
+});
+
+test("compareIterations by revisions", function()
+{
+ var finished = false;
+ var iteration1 = new BuildbotIteration(this.queue, 1, finished);
+ var iteration2 = new BuildbotIteration(this.queue, 2, finished);
+ iteration1.revision = { "openSource": 33018 };
+ iteration2.revision = { "openSource": 33019 };
+ iteration1.loaded = true;
+ iteration2.loaded = true;
+ ok(this.queue.compareIterations(iteration2, iteration1) < 0, "compareIterations: less than");
+ ok(this.queue.compareIterations(iteration1, iteration2) > 0, "compareIterations: greater than");
+ strictEqual(this.queue.compareIterations(iteration2, iteration2), 0, "compareIterations: equal");
+});
+
+test("compareIterations by loaded (one revision missing)", function()
+{
+ var finished = false;
+ var iteration1 = new BuildbotIteration(this.queue, 1, finished);
+ var iteration2 = new BuildbotIteration(this.queue, 2, finished);
+ iteration1.revision = {};
+ iteration2.revision = { "openSource": 33019 };
+ iteration1.loaded = false;
+ iteration2.loaded = true;
+ ok(this.queue.compareIterations(iteration1, iteration2) > 0, "compareIterations: greater than");
+ ok(this.queue.compareIterations(iteration2, iteration1) < 0, "compareIterations: less than");
+});
+
+test("compareIterations by loaded (same revision)", function()
+{
+ var finished = false;
+ var iteration1 = new BuildbotIteration(this.queue, 1, finished);
+ var iteration2 = new BuildbotIteration(this.queue, 2, finished);
+ iteration1.revision = { "openSource": 33019 };
+ iteration2.revision = { "openSource": 33019 };
+ iteration1.loaded = false;
+ iteration2.loaded = true;
+ ok(this.queue.compareIterations(iteration1, iteration2) > 0, "compareIterations: greater than");
+ ok(this.queue.compareIterations(iteration2, iteration1) < 0, "compareIterations: less than");
+});
+
+test("compareIterations by id (revisions not specified)", function()
+{
+ var finished = false;
+ var iteration1 = new BuildbotIteration(this.queue, 1, finished);
+ var iteration2 = new BuildbotIteration(this.queue, 2, finished);
+ iteration1.revision = {};
+ iteration2.revision = {};
+ iteration1.loaded = false;
+ iteration2.loaded = false;
+ ok(this.queue.compareIterations(iteration2, iteration1) < 0, "compareIterations: less than");
+ ok(this.queue.compareIterations(iteration1, iteration2) > 0, "compareIterations: greater than");
+ strictEqual(this.queue.compareIterations(iteration2, iteration2), 0, "compareIterations: equal");
+});
+
+test("compareIterations by id (same revision)", function()
+{
+ var finished = false;
+ var iteration1 = new BuildbotIteration(this.queue, 1, finished);
+ var iteration2 = new BuildbotIteration(this.queue, 2, finished);
+ iteration1.revision = { "openSource": 33019 };
+ iteration2.revision = { "openSource": 33019 };
+ iteration1.loaded = false;
+ iteration2.loaded = false;
+ ok(this.queue.compareIterations(iteration2, iteration1) < 0, "compareIterations: less than");
+ ok(this.queue.compareIterations(iteration1, iteration2) > 0, "compareIterations: greater than");
+ strictEqual(this.queue.compareIterations(iteration2, iteration2), 0, "compareIterations: equal");
+});
+
+test("compareIterationsByRevisions", function()
+{
+ var finished = false;
+ var iteration1 = new BuildbotIteration(this.queue, 1, finished);
+ var iteration2 = new BuildbotIteration(this.queue, 2, finished);
+ iteration1.revision = { "openSource": 33018 };
+ iteration2.revision = { "openSource": 33019 };
+ iteration1.loaded = true;
+ iteration2.loaded = false;
+ ok(this.queue.compareIterationsByRevisions(iteration2, iteration1) < 0, "compareIterationsByRevisions: less than");
+ ok(this.queue.compareIterationsByRevisions(iteration1, iteration2) > 0, "compareIterationsByRevisions: greater than");
+ strictEqual(this.queue.compareIterationsByRevisions(iteration2, iteration2), 0, "compareIterationsByRevisions: equal");
+});
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (195390 => 195391)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2016-01-20 23:40:44 UTC (rev 195390)
+++ trunk/Tools/ChangeLog 2016-01-21 00:20:33 UTC (rev 195391)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2016-01-20 Jason Marcell <jmarcell@apple.com>
+
+ Refactor compareIterations to remove duplicate code.
+ https://bugs.webkit.org/show_bug.cgi?id=152913
+
+ Reviewed by Daniel Bates.
+
+ * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotQueue.js:
+ (BuildbotQueue.prototype.compareIterations): Refactored to remove duplicate code.
+ (BuildbotQueue.prototype.sortIterations): Add binding to call to compareIterations.
+ * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/tests/tests.js: Added tests in order to ensure
+ the same behavior before and after refactor.
+
</ins><span class="cx"> 2016-01-20 Dana Burkart <dburkart@apple.com>
</span><span class="cx">
</span><span class="cx"> Botwatcher's dashboard should show an 'X' when the build is broken
</span></span></pre>
</div>
</div>
</body>
</html>