<!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>[199388] trunk/Websites/perf.webkit.org</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/199388">199388</a></dd>
<dt>Author</dt> <dd>rniwa@webkit.org</dd>
<dt>Date</dt> <dd>2016-04-12 14:04:09 -0700 (Tue, 12 Apr 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Make sync-buildbot.js fault safe
https://bugs.webkit.org/show_bug.cgi?id=156498
Reviewed by Chris Dumez.
Fixed a bug that sync-buildbot.js will continue to schedule build requests from multiple test groups
if multiple test groups are simultaneously in-progress on the same builder. Also fixed a bug that if
a build request had failed without leaving a trace (i.e. no entry on any of the builders we know of),
sync-buildbot.js throws an exception.
* server-tests/tools-buildbot-triggerable-tests.js: Added test cases.
* tools/js/buildbot-syncer.js:
(BuildbotSyncer.prototype.scheduleRequestInGroupIfAvailable): Renamed. Optionally takes the slave name.
When this parameter is specified, schedule the request only if the specified slave is available.
* tools/js/buildbot-triggerable.js:
(BuildbotTriggerable.prototype._scheduleNextRequestInGroupIfSlaveIsAvailable): Always use
scheduleRequestInGroupIfAvailable to schedule a new build request. Using scheduleRequest for non-first
build requests was problematic when there were multiple test groups with pending requests because then
we would schedule those pending requests without checking whether there is already a pending job or if
we have previously scheduled a job. Also fallback to use any syncer / builder when groupInfo.syncer is
not set even if the next request was not the first one in the test group since we can't determine on
which builder preceding requests are processed in such cases.
* unit-tests/buildbot-syncer-tests.js:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkWebsitesperfwebkitorgChangeLog">trunk/Websites/perf.webkit.org/ChangeLog</a></li>
<li><a href="#trunkWebsitesperfwebkitorgserverteststoolsbuildbottriggerabletestsjs">trunk/Websites/perf.webkit.org/server-tests/tools-buildbot-triggerable-tests.js</a></li>
<li><a href="#trunkWebsitesperfwebkitorgtoolsjsbuildbotsyncerjs">trunk/Websites/perf.webkit.org/tools/js/buildbot-syncer.js</a></li>
<li><a href="#trunkWebsitesperfwebkitorgtoolsjsbuildbottriggerablejs">trunk/Websites/perf.webkit.org/tools/js/buildbot-triggerable.js</a></li>
<li><a href="#trunkWebsitesperfwebkitorgunittestsbuildbotsyncertestsjs">trunk/Websites/perf.webkit.org/unit-tests/buildbot-syncer-tests.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkWebsitesperfwebkitorgChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Websites/perf.webkit.org/ChangeLog (199387 => 199388)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Websites/perf.webkit.org/ChangeLog 2016-04-12 21:03:52 UTC (rev 199387)
+++ trunk/Websites/perf.webkit.org/ChangeLog 2016-04-12 21:04:09 UTC (rev 199388)
</span><span class="lines">@@ -1,3 +1,29 @@
</span><ins>+2016-04-12 Ryosuke Niwa <rniwa@webkit.org>
+
+ Make sync-buildbot.js fault safe
+ https://bugs.webkit.org/show_bug.cgi?id=156498
+
+ Reviewed by Chris Dumez.
+
+ Fixed a bug that sync-buildbot.js will continue to schedule build requests from multiple test groups
+ if multiple test groups are simultaneously in-progress on the same builder. Also fixed a bug that if
+ a build request had failed without leaving a trace (i.e. no entry on any of the builders we know of),
+ sync-buildbot.js throws an exception.
+
+ * server-tests/tools-buildbot-triggerable-tests.js: Added test cases.
+ * tools/js/buildbot-syncer.js:
+ (BuildbotSyncer.prototype.scheduleRequestInGroupIfAvailable): Renamed. Optionally takes the slave name.
+ When this parameter is specified, schedule the request only if the specified slave is available.
+ * tools/js/buildbot-triggerable.js:
+ (BuildbotTriggerable.prototype._scheduleNextRequestInGroupIfSlaveIsAvailable): Always use
+ scheduleRequestInGroupIfAvailable to schedule a new build request. Using scheduleRequest for non-first
+ build requests was problematic when there were multiple test groups with pending requests because then
+ we would schedule those pending requests without checking whether there is already a pending job or if
+ we have previously scheduled a job. Also fallback to use any syncer / builder when groupInfo.syncer is
+ not set even if the next request was not the first one in the test group since we can't determine on
+ which builder preceding requests are processed in such cases.
+ * unit-tests/buildbot-syncer-tests.js:
+
</ins><span class="cx"> 2016-04-11 Ryosuke Niwa <rniwa@webkit.org>
</span><span class="cx">
</span><span class="cx"> Replace script runner to use mocha.js tests
</span></span></pre></div>
<a id="trunkWebsitesperfwebkitorgserverteststoolsbuildbottriggerabletestsjs"></a>
<div class="modfile"><h4>Modified: trunk/Websites/perf.webkit.org/server-tests/tools-buildbot-triggerable-tests.js (199387 => 199388)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Websites/perf.webkit.org/server-tests/tools-buildbot-triggerable-tests.js 2016-04-12 21:03:52 UTC (rev 199387)
+++ trunk/Websites/perf.webkit.org/server-tests/tools-buildbot-triggerable-tests.js 2016-04-12 21:04:09 UTC (rev 199388)
</span><span class="lines">@@ -651,6 +651,161 @@
</span><span class="cx"> }).catch(done);
</span><span class="cx"> });
</span><span class="cx">
</span><ins>+ it('should recover from multiple test groups running simultenously', function (done) {
+ let db = TestServer.database();
+ let syncPromise;
+ db.connect().then(function () {
+ return Promise.all([
+ MockData.addMockData(db, ['completed', 'pending', 'pending', 'pending']),
+ MockData.addAnotherMockTestGroup(db, ['completed', 'pending', 'pending', 'pending'])
+ ]);
+ }).then(function () {
+ return Manifest.fetch();
+ }).then(function () {
+ let config = MockData.mockTestSyncConfigWithSingleBuilder();
+ let logger = new MockLogger;
+ let slaveInfo = {name: 'sync-slave', password: 'password'};
+ let triggerable = new BuildbotTriggerable(config, TestServer.remoteAPI(), MockRemoteAPI, slaveInfo, logger);
+ syncPromise = triggerable.syncOnce();
+ syncPromise.catch(done);
+ return MockRemoteAPI.waitForRequest();
+ }).then(function () {
+ assert.equal(MockRemoteAPI.requests.length, 1);
+ assert.equal(MockRemoteAPI.requests[0].method, 'GET');
+ assert.equal(MockRemoteAPI.requests[0].url, '/json/builders/some-builder-1/pendingBuilds');
+ MockRemoteAPI.requests[0].resolve([MockData.pendingBuild({buildRequestId: 711})]);
+ return MockRemoteAPI.waitForRequest();
+ }).then(function () {
+ assert.equal(MockRemoteAPI.requests.length, 2);
+ assert.equal(MockRemoteAPI.requests[1].method, 'GET');
+ assert.equal(MockRemoteAPI.requests[1].url, '/json/builders/some-builder-1/builds/?select=-1&select=-2');
+ MockRemoteAPI.requests[1].resolve({[-1]: MockData.runningBuild({buildRequestId: 700}), [-2]: MockData.finishedBuild({buildRequestId: 710})});
+ return MockRemoteAPI.waitForRequest();
+ }).then(function () {
+ assert.equal(MockRemoteAPI.requests.length, 3);
+ assert.equal(MockRemoteAPI.requests[2].method, 'GET');
+ assert.equal(MockRemoteAPI.requests[2].url, '/json/builders/some-builder-1/pendingBuilds');
+ MockRemoteAPI.requests[2].resolve([MockData.pendingBuild({buildRequestId: 701})]);
+ return MockRemoteAPI.waitForRequest();
+ }).then(function () {
+ assert.equal(MockRemoteAPI.requests.length, 4);
+ assert.equal(MockRemoteAPI.requests[3].method, 'GET');
+ assert.equal(MockRemoteAPI.requests[3].url, '/json/builders/some-builder-1/builds/?select=-1&select=-2');
+ MockRemoteAPI.requests[3].resolve({[-1]: MockData.runningBuild({buildRequestId: 700}), [-2]: MockData.finishedBuild({buildRequestId: 710})});
+ return syncPromise;
+ }).then(function () {
+ assert.equal(BuildRequest.all().length, 8);
+ assert.equal(BuildRequest.findById(700).status(), 'completed');
+ assert.equal(BuildRequest.findById(700).statusUrl(), null);
+ assert.equal(BuildRequest.findById(701).status(), 'pending');
+ assert.equal(BuildRequest.findById(701).statusUrl(), null);
+ assert.equal(BuildRequest.findById(702).status(), 'pending');
+ assert.equal(BuildRequest.findById(702).statusUrl(), null);
+ assert.equal(BuildRequest.findById(703).status(), 'pending');
+ assert.equal(BuildRequest.findById(703).statusUrl(), null);
+ assert.equal(BuildRequest.findById(710).status(), 'completed');
+ assert.equal(BuildRequest.findById(710).statusUrl(), null);
+ assert.equal(BuildRequest.findById(711).status(), 'pending');
+ assert.equal(BuildRequest.findById(711).statusUrl(), null);
+ assert.equal(BuildRequest.findById(712).status(), 'pending');
+ assert.equal(BuildRequest.findById(712).statusUrl(), null);
+ assert.equal(BuildRequest.findById(713).status(), 'pending');
+ assert.equal(BuildRequest.findById(713).statusUrl(), null);
+ return BuildRequest.fetchForTriggerable(MockData.mockTestSyncConfigWithTwoBuilders().triggerableName);
+ }).then(function () {
+ assert.equal(BuildRequest.all().length, 8);
+ assert.equal(BuildRequest.findById(700).status(), 'completed');
+ assert.equal(BuildRequest.findById(700).statusUrl(), 'http://build.webkit.org/builders/some-builder-1/builds/124');
+ assert.equal(BuildRequest.findById(701).status(), 'scheduled');
+ assert.equal(BuildRequest.findById(701).statusUrl(), 'http://build.webkit.org/builders/some-builder-1/');
+ assert.equal(BuildRequest.findById(702).status(), 'pending');
+ assert.equal(BuildRequest.findById(702).statusUrl(), null);
+ assert.equal(BuildRequest.findById(703).status(), 'pending');
+ assert.equal(BuildRequest.findById(703).statusUrl(), null);
+ assert.equal(BuildRequest.findById(710).status(), 'completed');
+ assert.equal(BuildRequest.findById(710).statusUrl(), 'http://build.webkit.org/builders/some-builder-1/builds/123');
+ assert.equal(BuildRequest.findById(711).status(), 'pending');
+ assert.equal(BuildRequest.findById(711).statusUrl(), null);
+ assert.equal(BuildRequest.findById(712).status(), 'pending');
+ assert.equal(BuildRequest.findById(712).statusUrl(), null);
+ assert.equal(BuildRequest.findById(713).status(), 'pending');
+ assert.equal(BuildRequest.findById(713).statusUrl(), null);
+ done();
+ }).catch(done);
+ });
+
+ it('should recover from missing failed build request', function (done) {
+ let db = TestServer.database();
+ let syncPromise;
+ db.connect().then(function () {
+ return Promise.all([
+ MockData.addMockData(db, ['failed', 'pending', 'pending', 'pending']),
+ ]);
+ }).then(function () {
+ return Manifest.fetch();
+ }).then(function () {
+ let config = MockData.mockTestSyncConfigWithSingleBuilder();
+ let logger = new MockLogger;
+ let slaveInfo = {name: 'sync-slave', password: 'password'};
+ let triggerable = new BuildbotTriggerable(config, TestServer.remoteAPI(), MockRemoteAPI, slaveInfo, logger);
+ syncPromise = triggerable.syncOnce();
+ syncPromise.catch(done);
+ return MockRemoteAPI.waitForRequest();
+ }).then(function () {
+ assert.equal(MockRemoteAPI.requests.length, 1);
+ assert.equal(MockRemoteAPI.requests[0].method, 'GET');
+ assert.equal(MockRemoteAPI.requests[0].url, '/json/builders/some-builder-1/pendingBuilds');
+ MockRemoteAPI.requests[0].resolve([]);
+ return MockRemoteAPI.waitForRequest();
+ }).then(function () {
+ assert.equal(MockRemoteAPI.requests.length, 2);
+ assert.equal(MockRemoteAPI.requests[1].method, 'GET');
+ assert.equal(MockRemoteAPI.requests[1].url, '/json/builders/some-builder-1/builds/?select=-1&select=-2');
+ MockRemoteAPI.requests[1].resolve({});
+ return MockRemoteAPI.waitForRequest();
+ }).then(function () {
+ assert.equal(MockRemoteAPI.requests.length, 3);
+ assert.equal(MockRemoteAPI.requests[2].method, 'POST');
+ assert.equal(MockRemoteAPI.requests[2].url, '/builders/some-builder-1/force');
+ assert.deepEqual(MockRemoteAPI.requests[2].data, {'wk': '192736', 'os': '10.11 15A284', 'build-request-id': '701'});
+ MockRemoteAPI.requests[2].resolve('OK');
+ }).then(function () {
+ assert.equal(MockRemoteAPI.requests.length, 4);
+ assert.equal(MockRemoteAPI.requests[3].method, 'GET');
+ assert.equal(MockRemoteAPI.requests[3].url, '/json/builders/some-builder-1/pendingBuilds');
+ MockRemoteAPI.requests[3].resolve([MockData.pendingBuild({buildRequestId: 701})]);
+ return MockRemoteAPI.waitForRequest();
+ }).then(function () {
+ assert.equal(MockRemoteAPI.requests.length, 5);
+ assert.equal(MockRemoteAPI.requests[4].method, 'GET');
+ assert.equal(MockRemoteAPI.requests[4].url, '/json/builders/some-builder-1/builds/?select=-1&select=-2');
+ MockRemoteAPI.requests[4].resolve({});
+ return syncPromise;
+ }).then(function () {
+ assert.equal(BuildRequest.all().length, 4);
+ assert.equal(BuildRequest.findById(700).status(), 'failed');
+ assert.equal(BuildRequest.findById(700).statusUrl(), null);
+ assert.equal(BuildRequest.findById(701).status(), 'pending');
+ assert.equal(BuildRequest.findById(701).statusUrl(), null);
+ assert.equal(BuildRequest.findById(702).status(), 'pending');
+ assert.equal(BuildRequest.findById(702).statusUrl(), null);
+ assert.equal(BuildRequest.findById(703).status(), 'pending');
+ assert.equal(BuildRequest.findById(703).statusUrl(), null);
+ return BuildRequest.fetchForTriggerable(MockData.mockTestSyncConfigWithTwoBuilders().triggerableName);
+ }).then(function () {
+ assert.equal(BuildRequest.all().length, 4);
+ assert.equal(BuildRequest.findById(700).status(), 'failed');
+ assert.equal(BuildRequest.findById(700).statusUrl(), null);
+ assert.equal(BuildRequest.findById(701).status(), 'scheduled');
+ assert.equal(BuildRequest.findById(701).statusUrl(), 'http://build.webkit.org/builders/some-builder-1/');
+ assert.equal(BuildRequest.findById(702).status(), 'pending');
+ assert.equal(BuildRequest.findById(702).statusUrl(), null);
+ assert.equal(BuildRequest.findById(703).status(), 'pending');
+ assert.equal(BuildRequest.findById(703).statusUrl(), null);
+ done();
+ }).catch(done);
+ });
+
</ins><span class="cx"> it('should update the status of a supposedly scheduled build that went missing', function (done) {
</span><span class="cx"> let db = TestServer.database();
</span><span class="cx"> let syncPromise;
</span></span></pre></div>
<a id="trunkWebsitesperfwebkitorgtoolsjsbuildbotsyncerjs"></a>
<div class="modfile"><h4>Modified: trunk/Websites/perf.webkit.org/tools/js/buildbot-syncer.js (199387 => 199388)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Websites/perf.webkit.org/tools/js/buildbot-syncer.js 2016-04-12 21:03:52 UTC (rev 199387)
+++ trunk/Websites/perf.webkit.org/tools/js/buildbot-syncer.js 2016-04-12 21:04:09 UTC (rev 199388)
</span><span class="lines">@@ -101,7 +101,7 @@
</span><span class="cx"> return this._remote.postFormUrlencodedData(this.pathForForceBuild(), properties);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- scheduleFirstRequestInGroupIfAvailable(newRequest)
</del><ins>+ scheduleRequestInGroupIfAvailable(newRequest, slaveName)
</ins><span class="cx"> {
</span><span class="cx"> assert(newRequest instanceof BuildRequest);
</span><span class="cx">
</span><span class="lines">@@ -124,6 +124,12 @@
</span><span class="cx"> return this.scheduleRequest(newRequest, null);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if (slaveName) {
+ if (!usedSlaves.has(slaveName) && !this._slavesWithNewRequests.has(slaveName))
+ return this.scheduleRequest(newRequest, slaveName);
+ return null;
+ }
+
</ins><span class="cx"> for (let slaveName of this._slaveList) {
</span><span class="cx"> if (!usedSlaves.has(slaveName) && !this._slavesWithNewRequests.has(slaveName))
</span><span class="cx"> return this.scheduleRequest(newRequest, slaveName);
</span></span></pre></div>
<a id="trunkWebsitesperfwebkitorgtoolsjsbuildbottriggerablejs"></a>
<div class="modfile"><h4>Modified: trunk/Websites/perf.webkit.org/tools/js/buildbot-triggerable.js (199387 => 199388)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Websites/perf.webkit.org/tools/js/buildbot-triggerable.js 2016-04-12 21:03:52 UTC (rev 199387)
+++ trunk/Websites/perf.webkit.org/tools/js/buildbot-triggerable.js 2016-04-12 21:04:09 UTC (rev 199388)
</span><span class="lines">@@ -132,19 +132,30 @@
</span><span class="cx"> if (!nextRequest)
</span><span class="cx"> return null;
</span><span class="cx">
</span><ins>+ let promise;
+ let syncer;
</ins><span class="cx"> if (!!nextRequest.order()) {
</span><del>- this._logger.log(`Scheduling build request ${nextRequest.id()} on ${groupInfo.slaveName} in ${groupInfo.syncer.builderName()}`);
- return groupInfo.syncer.scheduleRequest(nextRequest, groupInfo.slaveName);
</del><ins>+ syncer = groupInfo.syncer;
+ if (!syncer)
+ this._logger.error(`Could not identify the syncer for ${nextRequest.id()}.`);
+ else
+ promise = syncer.scheduleRequestInGroupIfAvailable(nextRequest, groupInfo.slaveName);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- for (let syncer of this._syncers) {
- let promise = syncer.scheduleFirstRequestInGroupIfAvailable(nextRequest);
- if (promise) {
- let slaveName = groupInfo.slaveName ? ` on ${groupInfo.slaveName}` : '';
- this._logger.log(`Scheduling build request ${nextRequest.id()}${slaveName} in ${syncer.builderName()}`);
- return promise;
</del><ins>+ if (!syncer) {
+ for (syncer of this._syncers) {
+ let promise = syncer.scheduleRequestInGroupIfAvailable(nextRequest);
+ if (promise)
+ break;
</ins><span class="cx"> }
</span><span class="cx"> }
</span><ins>+
+ if (promise) {
+ let slaveName = groupInfo.slaveName ? ` on ${groupInfo.slaveName}` : '';
+ this._logger.log(`Scheduling build request ${nextRequest.id()}${slaveName} in ${syncer.builderName()}`);
+ return promise;
+ }
+
</ins><span class="cx"> return null;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkWebsitesperfwebkitorgunittestsbuildbotsyncertestsjs"></a>
<div class="modfile"><h4>Modified: trunk/Websites/perf.webkit.org/unit-tests/buildbot-syncer-tests.js (199387 => 199388)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Websites/perf.webkit.org/unit-tests/buildbot-syncer-tests.js 2016-04-12 21:03:52 UTC (rev 199387)
+++ trunk/Websites/perf.webkit.org/unit-tests/buildbot-syncer-tests.js 2016-04-12 21:04:09 UTC (rev 199388)
</span><span class="lines">@@ -827,7 +827,7 @@
</span><span class="cx"> });
</span><span class="cx"> });
</span><span class="cx">
</span><del>- describe('scheduleFirstRequestInGroupIfAvailable', function () {
</del><ins>+ describe('scheduleRequestInGroupIfAvailable', function () {
</ins><span class="cx">
</span><span class="cx"> function pullBuildbotWithAssertion(syncer, pendingBuilds, inProgressAndFinishedBuilds)
</span><span class="cx"> {
</span><span class="lines">@@ -847,7 +847,7 @@
</span><span class="cx"> let syncer = BuildbotSyncer._loadConfig(MockRemoteAPI, {'configurations': [smallConfiguration()]})[0];
</span><span class="cx">
</span><span class="cx"> pullBuildbotWithAssertion(syncer, [], {}).then(function () {
</span><del>- syncer.scheduleFirstRequestInGroupIfAvailable(createSampleBuildRequest(MockModels.somePlatform, MockModels.someTest));
</del><ins>+ syncer.scheduleRequestInGroupIfAvailable(createSampleBuildRequest(MockModels.somePlatform, MockModels.someTest));
</ins><span class="cx"> }).then(function () {
</span><span class="cx"> assert.equal(requests.length, 1);
</span><span class="cx"> assert.equal(requests[0].url, '/builders/some%20builder/force');
</span><span class="lines">@@ -861,7 +861,7 @@
</span><span class="cx"> let syncer = BuildbotSyncer._loadConfig(MockRemoteAPI, {'configurations': [smallConfiguration()]})[0];
</span><span class="cx">
</span><span class="cx"> pullBuildbotWithAssertion(syncer, [], {[-1]: smallFinishedBuild()}).then(function () {
</span><del>- syncer.scheduleFirstRequestInGroupIfAvailable(createSampleBuildRequest(MockModels.somePlatform, MockModels.someTest));
</del><ins>+ syncer.scheduleRequestInGroupIfAvailable(createSampleBuildRequest(MockModels.somePlatform, MockModels.someTest));
</ins><span class="cx"> }).then(function () {
</span><span class="cx"> assert.equal(requests.length, 1);
</span><span class="cx"> assert.equal(requests[0].url, '/builders/some%20builder/force');
</span><span class="lines">@@ -875,7 +875,7 @@
</span><span class="cx"> let syncer = BuildbotSyncer._loadConfig(MockRemoteAPI, {'configurations': [smallConfiguration()]})[0];
</span><span class="cx">
</span><span class="cx"> pullBuildbotWithAssertion(syncer, [smallPendingBuild()], {}).then(function () {
</span><del>- syncer.scheduleFirstRequestInGroupIfAvailable(createSampleBuildRequest(MockModels.somePlatform, MockModels.someTest));
</del><ins>+ syncer.scheduleRequestInGroupIfAvailable(createSampleBuildRequest(MockModels.somePlatform, MockModels.someTest));
</ins><span class="cx"> }).then(function () {
</span><span class="cx"> assert.equal(requests.length, 0);
</span><span class="cx"> done();
</span><span class="lines">@@ -886,7 +886,7 @@
</span><span class="cx"> let syncer = BuildbotSyncer._loadConfig(MockRemoteAPI, sampleiOSConfig())[0];
</span><span class="cx">
</span><span class="cx"> pullBuildbotWithAssertion(syncer, [], {}).then(function () {
</span><del>- syncer.scheduleFirstRequestInGroupIfAvailable(createSampleBuildRequest(MockModels.iphone, MockModels.speedometer));
</del><ins>+ syncer.scheduleRequestInGroupIfAvailable(createSampleBuildRequest(MockModels.iphone, MockModels.speedometer));
</ins><span class="cx"> }).then(function () {
</span><span class="cx"> assert.equal(requests.length, 1);
</span><span class="cx"> assert.equal(requests[0].url, '/builders/ABTest-iPhone-RunBenchmark-Tests/force');
</span><span class="lines">@@ -899,7 +899,7 @@
</span><span class="cx"> let syncer = BuildbotSyncer._loadConfig(MockRemoteAPI, sampleiOSConfig())[1];
</span><span class="cx">
</span><span class="cx"> pullBuildbotWithAssertion(syncer, [], {[-1]: sampleFinishedBuild()}).then(function () {
</span><del>- syncer.scheduleFirstRequestInGroupIfAvailable(createSampleBuildRequest(MockModels.ipad, MockModels.speedometer));
</del><ins>+ syncer.scheduleRequestInGroupIfAvailable(createSampleBuildRequest(MockModels.ipad, MockModels.speedometer));
</ins><span class="cx"> }).then(function () {
</span><span class="cx"> assert.equal(requests.length, 1);
</span><span class="cx"> assert.equal(requests[0].url, '/builders/ABTest-iPad-RunBenchmark-Tests/force');
</span><span class="lines">@@ -912,7 +912,7 @@
</span><span class="cx"> let syncer = BuildbotSyncer._loadConfig(MockRemoteAPI, sampleiOSConfig())[1];
</span><span class="cx">
</span><span class="cx"> pullBuildbotWithAssertion(syncer, [samplePendingBuild()], {}).then(function () {
</span><del>- syncer.scheduleFirstRequestInGroupIfAvailable(createSampleBuildRequest(MockModels.ipad, MockModels.speedometer));
</del><ins>+ syncer.scheduleRequestInGroupIfAvailable(createSampleBuildRequest(MockModels.ipad, MockModels.speedometer));
</ins><span class="cx"> }).then(function () {
</span><span class="cx"> assert.equal(requests.length, 0);
</span><span class="cx"> done();
</span><span class="lines">@@ -923,7 +923,7 @@
</span><span class="cx"> let syncer = BuildbotSyncer._loadConfig(MockRemoteAPI, sampleiOSConfig())[1];
</span><span class="cx">
</span><span class="cx"> pullBuildbotWithAssertion(syncer, [samplePendingBuild(1, 1, 'another-slave')], {}).then(function () {
</span><del>- syncer.scheduleFirstRequestInGroupIfAvailable(createSampleBuildRequest(MockModels.ipad, MockModels.speedometer));
</del><ins>+ syncer.scheduleRequestInGroupIfAvailable(createSampleBuildRequest(MockModels.ipad, MockModels.speedometer));
</ins><span class="cx"> }).then(function () {
</span><span class="cx"> assert.equal(requests.length, 1);
</span><span class="cx"> done();
</span><span class="lines">@@ -934,7 +934,7 @@
</span><span class="cx"> let syncer = BuildbotSyncer._loadConfig(MockRemoteAPI, sampleiOSConfig())[1];
</span><span class="cx">
</span><span class="cx"> pullBuildbotWithAssertion(syncer, [], {[-1]: sampleInProgressBuild()}).then(function () {
</span><del>- syncer.scheduleFirstRequestInGroupIfAvailable(createSampleBuildRequest(MockModels.ipad, MockModels.speedometer));
</del><ins>+ syncer.scheduleRequestInGroupIfAvailable(createSampleBuildRequest(MockModels.ipad, MockModels.speedometer));
</ins><span class="cx"> }).then(function () {
</span><span class="cx"> assert.equal(requests.length, 1);
</span><span class="cx"> done();
</span><span class="lines">@@ -945,7 +945,7 @@
</span><span class="cx"> let syncer = BuildbotSyncer._loadConfig(MockRemoteAPI, sampleiOSConfig())[1];
</span><span class="cx">
</span><span class="cx"> pullBuildbotWithAssertion(syncer, [], {[-1]: sampleInProgressBuild('other-slave')}).then(function () {
</span><del>- syncer.scheduleFirstRequestInGroupIfAvailable(createSampleBuildRequest(MockModels.ipad, MockModels.speedometer));
</del><ins>+ syncer.scheduleRequestInGroupIfAvailable(createSampleBuildRequest(MockModels.ipad, MockModels.speedometer));
</ins><span class="cx"> }).then(function () {
</span><span class="cx"> assert.equal(requests.length, 1);
</span><span class="cx"> done();
</span><span class="lines">@@ -956,7 +956,7 @@
</span><span class="cx"> let syncer = BuildbotSyncer._loadConfig(MockRemoteAPI, sampleiOSConfig())[0];
</span><span class="cx">
</span><span class="cx"> pullBuildbotWithAssertion(syncer, [], {}).then(function () {
</span><del>- syncer.scheduleFirstRequestInGroupIfAvailable(createSampleBuildRequest(MockModels.ipad, MockModels.speedometer));
</del><ins>+ syncer.scheduleRequestInGroupIfAvailable(createSampleBuildRequest(MockModels.ipad, MockModels.speedometer));
</ins><span class="cx"> }).then(function () {
</span><span class="cx"> assert.equal(requests.length, 0);
</span><span class="cx"> done();
</span><span class="lines">@@ -971,7 +971,7 @@
</span><span class="cx"> syncer.scheduleRequest(createSampleBuildRequest(MockModels.ipad, MockModels.speedometer), 'ABTest-iPad-1');
</span><span class="cx"> }).then(function () {
</span><span class="cx"> assert.equal(requests.length, 2);
</span><del>- syncer.scheduleFirstRequestInGroupIfAvailable(createSampleBuildRequest(MockModels.ipad, MockModels.speedometer));
</del><ins>+ syncer.scheduleRequestInGroupIfAvailable(createSampleBuildRequest(MockModels.ipad, MockModels.speedometer));
</ins><span class="cx"> }).then(function () {
</span><span class="cx"> assert.equal(requests.length, 2);
</span><span class="cx"> done();
</span><span class="lines">@@ -985,7 +985,7 @@
</span><span class="cx"> syncer.scheduleRequest(createSampleBuildRequest(MockModels.ipad, MockModels.speedometer), 'ABTest-iPad-0');
</span><span class="cx"> }).then(function () {
</span><span class="cx"> assert.equal(requests.length, 1);
</span><del>- syncer.scheduleFirstRequestInGroupIfAvailable(createSampleBuildRequest(MockModels.ipad, MockModels.speedometer), 'ABTest-iPad-1');
</del><ins>+ syncer.scheduleRequestInGroupIfAvailable(createSampleBuildRequest(MockModels.ipad, MockModels.speedometer), 'ABTest-iPad-1');
</ins><span class="cx"> }).then(function () {
</span><span class="cx"> assert.equal(requests.length, 2);
</span><span class="cx"> done();
</span><span class="lines">@@ -999,7 +999,7 @@
</span><span class="cx"> syncer.scheduleRequest(createSampleBuildRequest(MockModels.somePlatform, MockModels.someTest), null);
</span><span class="cx"> }).then(function () {
</span><span class="cx"> assert.equal(requests.length, 1);
</span><del>- syncer.scheduleFirstRequestInGroupIfAvailable(createSampleBuildRequest(MockModels.somePlatform, MockModels.someTest));
</del><ins>+ syncer.scheduleRequestInGroupIfAvailable(createSampleBuildRequest(MockModels.somePlatform, MockModels.someTest));
</ins><span class="cx"> }).then(function () {
</span><span class="cx"> assert.equal(requests.length, 1);
</span><span class="cx"> done();
</span></span></pre>
</div>
</div>
</body>
</html>