<!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>[199210] 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/199210">199210</a></dd>
<dt>Author</dt> <dd>rniwa@webkit.org</dd>
<dt>Date</dt> <dd>2016-04-07 20:19:22 -0700 (Thu, 07 Apr 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>A/B testing bots should prioritize user created test groups
https://bugs.webkit.org/show_bug.cgi?id=156375
Reviewed by Chris Dumez.
Order build requests preferring user created ones over ones automatically created by detect-changes.js.
Also fixed a bug in BuildbotSyncer.scheduleFirstRequestInGroupIfAvailable that it was scheduling a new
build request on a builder/slave even when we had previously scheduled another build request.
* public/include/build-requests-fetcher.php:
(BuildRequestsFetcher::fetch_incomplete_requests_for_triggerable): Order build requested based on
author_order which is 0 when it's created by an user and 1 when it's created by detect-changes.js.
Since we're using ascending order, this would put user created test groups first.
* server-tests/api-build-requests-tests.js: Updated an existing test case and added a new test case
for testing that build requests for an user created test group shows up first.
* server-tests/resources/mock-data.js:
(MockData.addAnotherMockTestGroup): Takes an extra argument to specify the author name.
* server-tests/tools-buildbot-triggerable-tests.js: Added a test case for testing that build requests
for an user created test group shows up first.
* tools/js/buildbot-syncer.js:
(BuildbotSyncer): Added _slavesWithNewRequests to keep track of build slaves on which we have already
scheduled new build requests. Don't schedule more requests on these slaves.
(BuildbotSyncer.prototype.scheduleRequest):
(BuildbotSyncer.prototype.scheduleFirstRequestInGroupIfAvailable): Add the specified slave name (or null
when slaveList is not specified) to _slavesWithNewRequests.
(BuildbotSyncer.prototype.pullBuildbot): Clear the set after pulling buildbot since any build request
we have previously scheduled should be included in one of the entires now.
* unit-tests/buildbot-syncer-tests.js: Added test cases for the aforementioned bug.
(sampleiOSConfig): Added a second slave for new test cases.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkWebsitesperfwebkitorgChangeLog">trunk/Websites/perf.webkit.org/ChangeLog</a></li>
<li><a href="#trunkWebsitesperfwebkitorgpublicincludebuildrequestsfetcherphp">trunk/Websites/perf.webkit.org/public/include/build-requests-fetcher.php</a></li>
<li><a href="#trunkWebsitesperfwebkitorgservertestsapibuildrequeststestsjs">trunk/Websites/perf.webkit.org/server-tests/api-build-requests-tests.js</a></li>
<li><a href="#trunkWebsitesperfwebkitorgservertestsresourcesmockdatajs">trunk/Websites/perf.webkit.org/server-tests/resources/mock-data.js</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="#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 (199209 => 199210)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Websites/perf.webkit.org/ChangeLog 2016-04-08 02:11:48 UTC (rev 199209)
+++ trunk/Websites/perf.webkit.org/ChangeLog 2016-04-08 03:19:22 UTC (rev 199210)
</span><span class="lines">@@ -1,5 +1,38 @@
</span><span class="cx"> 2016-04-07 Ryosuke Niwa <rniwa@webkit.org>
</span><span class="cx">
</span><ins>+ A/B testing bots should prioritize user created test groups
+ https://bugs.webkit.org/show_bug.cgi?id=156375
+
+ Reviewed by Chris Dumez.
+
+ Order build requests preferring user created ones over ones automatically created by detect-changes.js.
+
+ Also fixed a bug in BuildbotSyncer.scheduleFirstRequestInGroupIfAvailable that it was scheduling a new
+ build request on a builder/slave even when we had previously scheduled another build request.
+
+ * public/include/build-requests-fetcher.php:
+ (BuildRequestsFetcher::fetch_incomplete_requests_for_triggerable): Order build requested based on
+ author_order which is 0 when it's created by an user and 1 when it's created by detect-changes.js.
+ Since we're using ascending order, this would put user created test groups first.
+ * server-tests/api-build-requests-tests.js: Updated an existing test case and added a new test case
+ for testing that build requests for an user created test group shows up first.
+ * server-tests/resources/mock-data.js:
+ (MockData.addAnotherMockTestGroup): Takes an extra argument to specify the author name.
+ * server-tests/tools-buildbot-triggerable-tests.js: Added a test case for testing that build requests
+ for an user created test group shows up first.
+ * tools/js/buildbot-syncer.js:
+ (BuildbotSyncer): Added _slavesWithNewRequests to keep track of build slaves on which we have already
+ scheduled new build requests. Don't schedule more requests on these slaves.
+ (BuildbotSyncer.prototype.scheduleRequest):
+ (BuildbotSyncer.prototype.scheduleFirstRequestInGroupIfAvailable): Add the specified slave name (or null
+ when slaveList is not specified) to _slavesWithNewRequests.
+ (BuildbotSyncer.prototype.pullBuildbot): Clear the set after pulling buildbot since any build request
+ we have previously scheduled should be included in one of the entires now.
+ * unit-tests/buildbot-syncer-tests.js: Added test cases for the aforementioned bug.
+ (sampleiOSConfig): Added a second slave for new test cases.
+
+2016-04-07 Ryosuke Niwa <rniwa@webkit.org>
+
</ins><span class="cx"> Migrate legacy perf dashboard tests to mocha.js based tests
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=156335
</span><span class="cx">
</span></span></pre></div>
<a id="trunkWebsitesperfwebkitorgpublicincludebuildrequestsfetcherphp"></a>
<div class="modfile"><h4>Modified: trunk/Websites/perf.webkit.org/public/include/build-requests-fetcher.php (199209 => 199210)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Websites/perf.webkit.org/public/include/build-requests-fetcher.php 2016-04-08 02:11:48 UTC (rev 199209)
+++ trunk/Websites/perf.webkit.org/public/include/build-requests-fetcher.php 2016-04-08 03:19:22 UTC (rev 199210)
</span><span class="lines">@@ -26,12 +26,13 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function fetch_incomplete_requests_for_triggerable($triggerable_id) {
</span><del>- $this->rows = $this->db->query_and_fetch_all('SELECT * FROM build_requests
- WHERE request_triggerable = $1 AND request_group
- IN (SELECT testgroup_id FROM analysis_test_groups WHERE EXISTS
</del><ins>+ $this->rows = $this->db->query_and_fetch_all('SELECT * FROM build_requests,
+ (SELECT testgroup_id, (case when testgroup_author is not null then 0 else 1 end) as author_order, testgroup_created_at
+ FROM analysis_test_groups WHERE EXISTS
</ins><span class="cx"> (SELECT 1 FROM build_requests WHERE testgroup_id = request_group AND request_status
</span><del>- IN (\'pending\', \'scheduled\', \'running\')))
- ORDER BY request_group, request_order', array($triggerable_id));
</del><ins>+ IN (\'pending\', \'scheduled\', \'running\'))) AS test_groups
+ WHERE request_triggerable = $1 AND request_group = test_groups.testgroup_id
+ ORDER BY author_order, testgroup_created_at, request_order', array($triggerable_id));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function fetch_request($request_id) {
</span></span></pre></div>
<a id="trunkWebsitesperfwebkitorgservertestsapibuildrequeststestsjs"></a>
<div class="modfile"><h4>Modified: trunk/Websites/perf.webkit.org/server-tests/api-build-requests-tests.js (199209 => 199210)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Websites/perf.webkit.org/server-tests/api-build-requests-tests.js 2016-04-08 02:11:48 UTC (rev 199209)
+++ trunk/Websites/perf.webkit.org/server-tests/api-build-requests-tests.js 2016-04-08 03:19:22 UTC (rev 199210)
</span><span class="lines">@@ -326,16 +326,47 @@
</span><span class="cx"> }).catch(done);
</span><span class="cx"> });
</span><span class="cx">
</span><del>- it('should order build requests based on test group and order', function (done) {
</del><ins>+ it('should order build requests based on test group creation time and order', function (done) {
</ins><span class="cx"> let db = TestServer.database();
</span><span class="cx"> db.connect().then(function () {
</span><del>- return Promise.all([MockData.addMockData(db), MockData.addAnotherMockTestGroup(db)])
</del><ins>+ return Promise.all([MockData.addMockData(db), MockData.addAnotherMockTestGroup(db)]);
</ins><span class="cx"> }).then(function () {
</span><span class="cx"> return Manifest.fetch();
</span><span class="cx"> }).then(function () {
</span><span class="cx"> return BuildRequest.fetchForTriggerable('build-webkit');
</span><span class="cx"> }).then(function (buildRequests) {
</span><span class="cx"> assert.equal(buildRequests.length, 8);
</span><ins>+ assert.equal(buildRequests[0].id(), 700);
+ assert.equal(buildRequests[0].testGroupId(), 600);
+ assert.equal(buildRequests[1].id(), 701);
+ assert.equal(buildRequests[1].testGroupId(), 600);
+ assert.equal(buildRequests[2].id(), 702);
+ assert.equal(buildRequests[2].testGroupId(), 600);
+ assert.equal(buildRequests[3].id(), 703);
+ assert.equal(buildRequests[3].testGroupId(), 600);
+
+ assert.equal(buildRequests[4].id(), 710);
+ assert.equal(buildRequests[4].testGroupId(), 599);
+ assert.equal(buildRequests[5].id(), 711);
+ assert.equal(buildRequests[5].testGroupId(), 599);
+ assert.equal(buildRequests[6].id(), 712);
+ assert.equal(buildRequests[6].testGroupId(), 599);
+ assert.equal(buildRequests[7].id(), 713);
+ assert.equal(buildRequests[7].testGroupId(), 599);
+ done();
+ }).catch(done);
+ });
+
+ it('should place build requests created by user before automatically created ones', function (done) {
+ let db = TestServer.database();
+ db.connect().then(function () {
+ return Promise.all([MockData.addMockData(db), MockData.addAnotherMockTestGroup(db, null, 'rniwa')]);
+ }).then(function () {
+ return Manifest.fetch();
+ }).then(function () {
+ return BuildRequest.fetchForTriggerable('build-webkit');
+ }).then(function (buildRequests) {
+ assert.equal(buildRequests.length, 8);
</ins><span class="cx"> assert.equal(buildRequests[0].id(), 710);
</span><span class="cx"> assert.equal(buildRequests[0].testGroupId(), 599);
</span><span class="cx"> assert.equal(buildRequests[1].id(), 711);
</span><span class="lines">@@ -344,8 +375,16 @@
</span><span class="cx"> assert.equal(buildRequests[2].testGroupId(), 599);
</span><span class="cx"> assert.equal(buildRequests[3].id(), 713);
</span><span class="cx"> assert.equal(buildRequests[3].testGroupId(), 599);
</span><ins>+
+ assert.equal(buildRequests[4].id(), 700);
+ assert.equal(buildRequests[4].testGroupId(), 600);
+ assert.equal(buildRequests[5].id(), 701);
+ assert.equal(buildRequests[5].testGroupId(), 600);
+ assert.equal(buildRequests[6].id(), 702);
+ assert.equal(buildRequests[6].testGroupId(), 600);
+ assert.equal(buildRequests[7].id(), 703);
+ assert.equal(buildRequests[7].testGroupId(), 600);
</ins><span class="cx"> done();
</span><span class="cx"> }).catch(done);
</span><span class="cx"> });
</span><del>-
</del><span class="cx"> });
</span></span></pre></div>
<a id="trunkWebsitesperfwebkitorgservertestsresourcesmockdatajs"></a>
<div class="modfile"><h4>Modified: trunk/Websites/perf.webkit.org/server-tests/resources/mock-data.js (199209 => 199210)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Websites/perf.webkit.org/server-tests/resources/mock-data.js 2016-04-08 02:11:48 UTC (rev 199209)
+++ trunk/Websites/perf.webkit.org/server-tests/resources/mock-data.js 2016-04-08 03:19:22 UTC (rev 199210)
</span><span class="lines">@@ -46,12 +46,12 @@
</span><span class="cx"> db.insert('build_requests', {id: 703, status: statusList[3], triggerable: 1, platform: 65, test: 200, group: 600, order: 3, root_set: 402}),
</span><span class="cx"> ]);
</span><span class="cx"> },
</span><del>- addAnotherMockTestGroup: function (db, statusList)
</del><ins>+ addAnotherMockTestGroup: function (db, statusList, author)
</ins><span class="cx"> {
</span><span class="cx"> if (!statusList)
</span><span class="cx"> statusList = ['pending', 'pending', 'pending', 'pending'];
</span><span class="cx"> return Promise.all([
</span><del>- db.insert('analysis_test_groups', {id: 599, task: 500, name: 'another test group'}),
</del><ins>+ db.insert('analysis_test_groups', {id: 599, task: 500, name: 'another test group', author: author}),
</ins><span class="cx"> db.insert('build_requests', {id: 713, status: statusList[3], triggerable: 1, platform: 65, test: 200, group: 599, order: 3, root_set: 402}),
</span><span class="cx"> db.insert('build_requests', {id: 710, status: statusList[0], triggerable: 1, platform: 65, test: 200, group: 599, order: 0, root_set: 401}),
</span><span class="cx"> db.insert('build_requests', {id: 712, status: statusList[2], triggerable: 1, platform: 65, test: 200, group: 599, order: 2, root_set: 401}),
</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 (199209 => 199210)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Websites/perf.webkit.org/server-tests/tools-buildbot-triggerable-tests.js 2016-04-08 02:11:48 UTC (rev 199209)
+++ trunk/Websites/perf.webkit.org/server-tests/tools-buildbot-triggerable-tests.js 2016-04-08 03:19:22 UTC (rev 199210)
</span><span class="lines">@@ -440,5 +440,45 @@
</span><span class="cx"> done();
</span><span class="cx"> }).catch(done);
</span><span class="cx"> });
</span><ins>+
+ it('should schedule a build request of an user created test group before ones created by automatic change detection', function (done) {
+ let db = TestServer.database();
+ let syncPromise;
+ db.connect().then(function () {
+ return Promise.all([
+ MockData.addMockData(db, ['pending', 'pending', 'pending', 'pending']),
+ MockData.addAnotherMockTestGroup(db, ['pending', 'pending', 'pending', 'pending'], 'rniwa'),
+ ]);
+ }).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': '191622', 'os': '10.11 15A284', 'build-request-id': '710'});
+ MockRemoteAPI.requests[2].resolve('OK');
+ done();
+ }).catch(done);
+ });
</ins><span class="cx"> });
</span><span class="cx"> });
</span></span></pre></div>
<a id="trunkWebsitesperfwebkitorgtoolsjsbuildbotsyncerjs"></a>
<div class="modfile"><h4>Modified: trunk/Websites/perf.webkit.org/tools/js/buildbot-syncer.js (199209 => 199210)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Websites/perf.webkit.org/tools/js/buildbot-syncer.js 2016-04-08 02:11:48 UTC (rev 199209)
+++ trunk/Websites/perf.webkit.org/tools/js/buildbot-syncer.js 2016-04-08 03:19:22 UTC (rev 199210)
</span><span class="lines">@@ -66,6 +66,7 @@
</span><span class="cx"> this._slaveList = object.slaveList;
</span><span class="cx"> this._buildRequestPropertyName = object.buildRequestArgument;
</span><span class="cx"> this._entryList = null;
</span><ins>+ this._slavesWithNewRequests = new Set;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> builderName() { return this._builderName; }
</span><span class="lines">@@ -89,12 +90,14 @@
</span><span class="cx">
</span><span class="cx"> scheduleRequest(newRequest, slaveName)
</span><span class="cx"> {
</span><ins>+ assert(!this._slavesWithNewRequests.has(slaveName));
</ins><span class="cx"> let properties = this._propertiesForBuildRequest(newRequest);
</span><span class="cx">
</span><span class="cx"> assert.equal(!this._slavePropertyName, !slaveName);
</span><span class="cx"> if (this._slavePropertyName)
</span><span class="cx"> properties[this._slavePropertyName] = slaveName;
</span><span class="cx">
</span><ins>+ this._slavesWithNewRequests.add(slaveName);
</ins><span class="cx"> return this._remote.postFormUrlencodedData(this.pathForForceBuild(), properties);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -116,13 +119,13 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!this._slaveList || hasPendingBuildsWithoutSlaveNameSpecified) {
</span><del>- if (usedSlaves.size)
</del><ins>+ if (usedSlaves.size || this._slavesWithNewRequests.size)
</ins><span class="cx"> return null;
</span><span class="cx"> return this.scheduleRequest(newRequest, null);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> for (let slaveName of this._slaveList) {
</span><del>- if (!usedSlaves.has(slaveName))
</del><ins>+ if (!usedSlaves.has(slaveName) && !this._slavesWithNewRequests.has(slaveName))
</ins><span class="cx"> return this.scheduleRequest(newRequest, slaveName);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -148,6 +151,7 @@
</span><span class="cx"> entryList.push(entryByRequest[id]);
</span><span class="cx">
</span><span class="cx"> self._entryList = entryList;
</span><ins>+ self._slavesWithNewRequests.clear();
</ins><span class="cx">
</span><span class="cx"> return entryList;
</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 (199209 => 199210)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Websites/perf.webkit.org/unit-tests/buildbot-syncer-tests.js 2016-04-08 02:11:48 UTC (rev 199209)
+++ trunk/Websites/perf.webkit.org/unit-tests/buildbot-syncer-tests.js 2016-04-08 03:19:22 UTC (rev 199210)
</span><span class="lines">@@ -44,7 +44,7 @@
</span><span class="cx"> 'iPad-bench': {
</span><span class="cx"> 'builder': 'ABTest-iPad-RunBenchmark-Tests',
</span><span class="cx"> 'arguments': { 'forcescheduler': 'ABTest-iPad-RunBenchmark-Tests-ForceScheduler' },
</span><del>- 'slaveList': ['ABTest-iPad-0'],
</del><ins>+ 'slaveList': ['ABTest-iPad-0', 'ABTest-iPad-1'],
</ins><span class="cx"> }
</span><span class="cx"> },
</span><span class="cx"> 'configurations': [
</span><span class="lines">@@ -963,5 +963,47 @@
</span><span class="cx"> }).catch(done);
</span><span class="cx"> });
</span><span class="cx">
</span><ins>+ it('should not schedule a build if a new request had been submitted to the same slave', function (done) {
+ let syncer = BuildbotSyncer._loadConfig(MockRemoteAPI, sampleiOSConfig())[1];
+
+ pullBuildbotWithAssertion(syncer, [], {}).then(function () {
+ syncer.scheduleRequest(createSampleBuildRequest(MockModels.ipad, MockModels.speedometer), 'ABTest-iPad-0');
+ syncer.scheduleRequest(createSampleBuildRequest(MockModels.ipad, MockModels.speedometer), 'ABTest-iPad-1');
+ }).then(function () {
+ assert.equal(requests.length, 2);
+ syncer.scheduleFirstRequestInGroupIfAvailable(createSampleBuildRequest(MockModels.ipad, MockModels.speedometer));
+ }).then(function () {
+ assert.equal(requests.length, 2);
+ done();
+ }).catch(done);
+ });
+
+ it('should schedule a build if a new request had been submitted to another slave', function (done) {
+ let syncer = BuildbotSyncer._loadConfig(MockRemoteAPI, sampleiOSConfig())[1];
+
+ pullBuildbotWithAssertion(syncer, [], {}).then(function () {
+ syncer.scheduleRequest(createSampleBuildRequest(MockModels.ipad, MockModels.speedometer), 'ABTest-iPad-0');
+ }).then(function () {
+ assert.equal(requests.length, 1);
+ syncer.scheduleFirstRequestInGroupIfAvailable(createSampleBuildRequest(MockModels.ipad, MockModels.speedometer), 'ABTest-iPad-1');
+ }).then(function () {
+ assert.equal(requests.length, 2);
+ done();
+ }).catch(done);
+ });
+
+ it('should not schedule a build if a new request had been submitted to the same builder without slaveList', function (done) {
+ let syncer = BuildbotSyncer._loadConfig(MockRemoteAPI, {'configurations': [smallConfiguration()]})[0];
+
+ pullBuildbotWithAssertion(syncer, [], {}).then(function () {
+ syncer.scheduleRequest(createSampleBuildRequest(MockModels.somePlatform, MockModels.someTest), null);
+ }).then(function () {
+ assert.equal(requests.length, 1);
+ syncer.scheduleFirstRequestInGroupIfAvailable(createSampleBuildRequest(MockModels.somePlatform, MockModels.someTest));
+ }).then(function () {
+ assert.equal(requests.length, 1);
+ done();
+ }).catch(done);
+ });
</ins><span class="cx"> });
</span><span class="cx"> });
</span></span></pre>
</div>
</div>
</body>
</html>