<!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>[198882] 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/198882">198882</a></dd>
<dt>Author</dt> <dd>rniwa@webkit.org</dd>
<dt>Date</dt> <dd>2016-03-30 21:18:39 -0700 (Wed, 30 Mar 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>BuildRequest should have associated platform and test
https://bugs.webkit.org/show_bug.cgi?id=156054
Reviewed by Joseph Pecoraro.
Added methods to retrieve the platform and the test associated with a build request with tests.
* public/v3/models/build-request.js:
(BuildRequest):
(BuildRequest.prototype.platform): Added.
(BuildRequest.prototype.test): Added.
* server-tests/api-build-requests-tests.js:
* server-tests/api-manifest.js: Fixed a typo. This tests /api/manifest, not /api/build-requests.
* unit-tests/buildbot-syncer-tests.js:
(.createSampleBuildRequest): Now takes Platform and Test objects to avoid hitting assertions in
BuildRequest's constructor.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkWebsitesperfwebkitorgChangeLog">trunk/Websites/perf.webkit.org/ChangeLog</a></li>
<li><a href="#trunkWebsitesperfwebkitorgpublicv3modelsbuildrequestjs">trunk/Websites/perf.webkit.org/public/v3/models/build-request.js</a></li>
<li><a href="#trunkWebsitesperfwebkitorgservertestsapibuildrequeststestsjs">trunk/Websites/perf.webkit.org/server-tests/api-build-requests-tests.js</a></li>
<li><a href="#trunkWebsitesperfwebkitorgservertestsapimanifestjs">trunk/Websites/perf.webkit.org/server-tests/api-manifest.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 (198881 => 198882)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Websites/perf.webkit.org/ChangeLog 2016-03-31 03:56:25 UTC (rev 198881)
+++ trunk/Websites/perf.webkit.org/ChangeLog 2016-03-31 04:18:39 UTC (rev 198882)
</span><span class="lines">@@ -1,5 +1,24 @@
</span><span class="cx"> 2016-03-30 Ryosuke Niwa <rniwa@webkit.org>
</span><span class="cx">
</span><ins>+ BuildRequest should have associated platform and test
+ https://bugs.webkit.org/show_bug.cgi?id=156054
+
+ Reviewed by Joseph Pecoraro.
+
+ Added methods to retrieve the platform and the test associated with a build request with tests.
+
+ * public/v3/models/build-request.js:
+ (BuildRequest):
+ (BuildRequest.prototype.platform): Added.
+ (BuildRequest.prototype.test): Added.
+ * server-tests/api-build-requests-tests.js:
+ * server-tests/api-manifest.js: Fixed a typo. This tests /api/manifest, not /api/build-requests.
+ * unit-tests/buildbot-syncer-tests.js:
+ (.createSampleBuildRequest): Now takes Platform and Test objects to avoid hitting assertions in
+ BuildRequest's constructor.
+
+2016-03-30 Ryosuke Niwa <rniwa@webkit.org>
+
</ins><span class="cx"> BuildRequest should have a method to fetch all in-progress and pending requests for a triggerable
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=156008
</span><span class="cx">
</span></span></pre></div>
<a id="trunkWebsitesperfwebkitorgpublicv3modelsbuildrequestjs"></a>
<div class="modfile"><h4>Modified: trunk/Websites/perf.webkit.org/public/v3/models/build-request.js (198881 => 198882)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Websites/perf.webkit.org/public/v3/models/build-request.js 2016-03-31 03:56:25 UTC (rev 198881)
+++ trunk/Websites/perf.webkit.org/public/v3/models/build-request.js 2016-03-31 04:18:39 UTC (rev 198882)
</span><span class="lines">@@ -10,6 +10,10 @@
</span><span class="cx"> this._testGroup = object.testGroup;
</span><span class="cx"> if (this._testGroup)
</span><span class="cx"> this._testGroup.addBuildRequest(this);
</span><ins>+ console.assert(object.platform instanceof Platform);
+ this._platform = object.platform;
+ console.assert(object.test instanceof Test);
+ this._test = object.test;
</ins><span class="cx"> this._order = object.order;
</span><span class="cx"> console.assert(object.rootSet instanceof RootSet);
</span><span class="cx"> this._rootSet = object.rootSet;
</span><span class="lines">@@ -31,6 +35,8 @@
</span><span class="cx">
</span><span class="cx"> testGroupId() { return this._testGroupId; }
</span><span class="cx"> testGroup() { return this._testGroup; }
</span><ins>+ platform() { return this._platform; }
+ test() { return this._test; }
</ins><span class="cx"> order() { return this._order; }
</span><span class="cx"> rootSet() { return this._rootSet; }
</span><span class="cx">
</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 (198881 => 198882)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Websites/perf.webkit.org/server-tests/api-build-requests-tests.js 2016-03-31 03:56:25 UTC (rev 198881)
+++ trunk/Websites/perf.webkit.org/server-tests/api-build-requests-tests.js 2016-03-31 04:18:39 UTC (rev 198882)
</span><span class="lines">@@ -215,7 +215,16 @@
</span><span class="cx"> }).then(function (buildRequests) {
</span><span class="cx"> assert.equal(buildRequests.length, 4);
</span><span class="cx">
</span><ins>+ let test = Test.findById(200);
+ assert(test);
+
+ let platform = Platform.findById(65);
+ assert(platform);
+
</ins><span class="cx"> assert.equal(buildRequests[0].id(), 700);
</span><ins>+ assert.equal(buildRequests[0].testGroupId(), 600);
+ assert.equal(buildRequests[0].test(), test);
+ assert.equal(buildRequests[0].platform(), platform);
</ins><span class="cx"> assert.equal(buildRequests[0].order(), 0);
</span><span class="cx"> assert.ok(buildRequests[0].rootSet() instanceof RootSet);
</span><span class="cx"> assert.ok(!buildRequests[0].hasFinished());
</span><span class="lines">@@ -224,6 +233,9 @@
</span><span class="cx"> assert.equal(buildRequests[0].statusLabel(), 'Waiting to be scheduled');
</span><span class="cx">
</span><span class="cx"> assert.equal(buildRequests[1].id(), 701);
</span><ins>+ assert.equal(buildRequests[1].testGroupId(), 600);
+ assert.equal(buildRequests[1].test(), test);
+ assert.equal(buildRequests[1].platform(), platform);
</ins><span class="cx"> assert.equal(buildRequests[1].order(), 1);
</span><span class="cx"> assert.ok(buildRequests[1].rootSet() instanceof RootSet);
</span><span class="cx"> assert.ok(!buildRequests[1].hasFinished());
</span><span class="lines">@@ -232,6 +244,9 @@
</span><span class="cx"> assert.equal(buildRequests[1].statusLabel(), 'Waiting to be scheduled');
</span><span class="cx">
</span><span class="cx"> assert.equal(buildRequests[2].id(), 702);
</span><ins>+ assert.equal(buildRequests[2].testGroupId(), 600);
+ assert.equal(buildRequests[2].test(), test);
+ assert.equal(buildRequests[2].platform(), platform);
</ins><span class="cx"> assert.equal(buildRequests[2].order(), 2);
</span><span class="cx"> assert.ok(buildRequests[2].rootSet() instanceof RootSet);
</span><span class="cx"> assert.ok(!buildRequests[2].hasFinished());
</span><span class="lines">@@ -240,6 +255,9 @@
</span><span class="cx"> assert.equal(buildRequests[2].statusLabel(), 'Waiting to be scheduled');
</span><span class="cx">
</span><span class="cx"> assert.equal(buildRequests[3].id(), 703);
</span><ins>+ assert.equal(buildRequests[3].testGroupId(), 600);
+ assert.equal(buildRequests[3].test(), test);
+ assert.equal(buildRequests[3].platform(), platform);
</ins><span class="cx"> assert.equal(buildRequests[3].order(), 3);
</span><span class="cx"> assert.ok(buildRequests[3].rootSet() instanceof RootSet);
</span><span class="cx"> assert.ok(!buildRequests[3].hasFinished());
</span></span></pre></div>
<a id="trunkWebsitesperfwebkitorgservertestsapimanifestjs"></a>
<div class="modfile"><h4>Modified: trunk/Websites/perf.webkit.org/server-tests/api-manifest.js (198881 => 198882)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Websites/perf.webkit.org/server-tests/api-manifest.js 2016-03-31 03:56:25 UTC (rev 198881)
+++ trunk/Websites/perf.webkit.org/server-tests/api-manifest.js 2016-03-31 04:18:39 UTC (rev 198882)
</span><span class="lines">@@ -6,7 +6,7 @@
</span><span class="cx">
</span><span class="cx"> let TestServer = require('./resources/test-server.js');
</span><span class="cx">
</span><del>-describe('/api/build-requests', function () {
</del><ins>+describe('/api/manifest', function () {
</ins><span class="cx"> this.timeout(10000);
</span><span class="cx"> TestServer.inject();
</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 (198881 => 198882)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Websites/perf.webkit.org/unit-tests/buildbot-syncer-tests.js 2016-03-31 03:56:25 UTC (rev 198881)
+++ trunk/Websites/perf.webkit.org/unit-tests/buildbot-syncer-tests.js 2016-03-31 04:18:39 UTC (rev 198882)
</span><span class="lines">@@ -71,15 +71,18 @@
</span><span class="cx"> }
</span><span class="cx"> };
</span><span class="cx">
</span><del>-function createSampleBuildRequest()
</del><ins>+function createSampleBuildRequest(platform, test)
</ins><span class="cx"> {
</span><ins>+ assert(platform instanceof Platform);
+ assert(test instanceof Test);
+
</ins><span class="cx"> let rootSet = RootSet.ensureSingleton('4197', {roots: [
</span><span class="cx"> {'id': '111127', 'time': 1456955807334, 'repository': MockModels.webkit, 'revision': '197463'},
</span><span class="cx"> {'id': '111237', 'time': 1456931874000, 'repository': MockModels.sharedRepository, 'revision': '80229'},
</span><span class="cx"> {'id': '88930', 'time': 0, 'repository': MockModels.ios, 'revision': '13A452'},
</span><span class="cx"> ]});
</span><span class="cx">
</span><del>- let request = BuildRequest.ensureSingleton('16733', {'rootSet': rootSet, 'status': 'pending'});
</del><ins>+ let request = BuildRequest.ensureSingleton('16733', {'rootSet': rootSet, 'status': 'pending', 'platform': platform, 'test': test});
</ins><span class="cx"> return request;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -424,37 +427,38 @@
</span><span class="cx"> describe('_propertiesForBuildRequest', function () {
</span><span class="cx"> it('should include all properties specified in a given configuration', function () {
</span><span class="cx"> let syncers = BuildbotSyncer._loadConfig('http://build.webkit.org/', sampleiOSConfig());
</span><del>- let properties = syncers[0]._propertiesForBuildRequest(createSampleBuildRequest());
</del><ins>+ let properties = syncers[0]._propertiesForBuildRequest(createSampleBuildRequest(MockModels.iphone, MockModels.speedometer));
</ins><span class="cx"> assert.deepEqual(Object.keys(properties), ['desired_image', 'roots_dict', 'test_name', 'forcescheduler', 'build_request_id']);
</span><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> it('should preserve non-parametric property values', function () {
</span><span class="cx"> let syncers = BuildbotSyncer._loadConfig('http://build.webkit.org/', sampleiOSConfig());
</span><del>- let properties = syncers[0]._propertiesForBuildRequest(createSampleBuildRequest());
</del><ins>+ let properties = syncers[0]._propertiesForBuildRequest(createSampleBuildRequest(MockModels.iphone, MockModels.speedometer));
</ins><span class="cx"> assert.equal(properties['test_name'], 'speedometer');
</span><span class="cx"> assert.equal(properties['forcescheduler'], 'ABTest-iPhone-RunBenchmark-Tests-ForceScheduler');
</span><span class="cx">
</span><del>- properties = syncers[1]._propertiesForBuildRequest(createSampleBuildRequest());
</del><ins>+ properties = syncers[1]._propertiesForBuildRequest(createSampleBuildRequest(MockModels.iphone, MockModels.speedometer));
</ins><span class="cx"> assert.equal(properties['test_name'], 'jetstream');
</span><span class="cx"> assert.equal(properties['forcescheduler'], 'ABTest-iPhone-RunBenchmark-Tests-ForceScheduler');
</span><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> it('should resolve "root"', function () {
</span><span class="cx"> let syncers = BuildbotSyncer._loadConfig('http://build.webkit.org/', sampleiOSConfig());
</span><del>- let properties = syncers[0]._propertiesForBuildRequest(createSampleBuildRequest());
</del><ins>+ let properties = syncers[0]._propertiesForBuildRequest(createSampleBuildRequest(MockModels.iphone, MockModels.speedometer));
</ins><span class="cx"> assert.equal(properties['desired_image'], '13A452');
</span><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> it('should resolve "rootsExcluding"', function () {
</span><span class="cx"> let syncers = BuildbotSyncer._loadConfig('http://build.webkit.org/', sampleiOSConfig());
</span><del>- let properties = syncers[0]._propertiesForBuildRequest(createSampleBuildRequest());
</del><ins>+ let properties = syncers[0]._propertiesForBuildRequest(createSampleBuildRequest(MockModels.iphone, MockModels.speedometer));
</ins><span class="cx"> assert.equal(properties['roots_dict'], JSON.stringify(sampleRootSetData));
</span><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> it('should set the property for the build request id', function () {
</span><span class="cx"> let syncers = BuildbotSyncer._loadConfig('http://build.webkit.org/', sampleiOSConfig());
</span><del>- let properties = syncers[0]._propertiesForBuildRequest(createSampleBuildRequest());
- assert.equal(properties['build_request_id'], createSampleBuildRequest().id());
</del><ins>+ let request = createSampleBuildRequest(MockModels.iphone, MockModels.speedometer);
+ let properties = syncers[0]._propertiesForBuildRequest(request);
+ assert.equal(properties['build_request_id'], request.id());
</ins><span class="cx"> });
</span><span class="cx"> });
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>