<!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>[214000] 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/214000">214000</a></dd>
<dt>Author</dt> <dd>rniwa@webkit.org</dd>
<dt>Date</dt> <dd>2017-03-15 12:34:00 -0700 (Wed, 15 Mar 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix server tests after <a href="http://trac.webkit.org/projects/webkit/changeset/213998">r213998</a> and <a href="http://trac.webkit.org/projects/webkit/changeset/213969">r213969</a>
https://bugs.webkit.org/show_bug.cgi?id=169690
Reviewed by Antti Koivisto.
Fixed the existing server tests.
* public/v3/models/analysis-task.js:
(AnalysisTask.prototype._updateRemoteState): Use the relative path from the root so that it works inside tests.
(AnalysisTask.prototype.associateBug): Ditto.
(AnalysisTask.prototype.dissociateBug): Ditto.
(AnalysisTask.prototype.associateCommit): Ditto.
(AnalysisTask.prototype.dissociateCommit): Ditto.
(AnalysisTask._fetchSubset): Ditto.
(AnalysisTask.fetchAll): Ditto.
* public/v3/models/test-group.js:
(TestGroup.prototype.updateName): Ditto.
(TestGroup.prototype.updateHiddenFlag): Ditto.
(TestGroup.createAndRefetchTestGroups): Ditto.
(TestGroup.cachedFetch): Ditto.
* server-tests/api-manifest.js: Reverted an inadvertant change in <a href="http://trac.webkit.org/projects/webkit/changeset/213969">r213969</a>.
* tools/js/database.js:
(tableToPrefixMap): Added analysis_strategies.
* unit-tests/analysis-task-tests.js: Updated expectations per changes to AnalysisTask.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkWebsitesperfwebkitorgChangeLog">trunk/Websites/perf.webkit.org/ChangeLog</a></li>
<li><a href="#trunkWebsitesperfwebkitorgpublicv3modelsanalysistaskjs">trunk/Websites/perf.webkit.org/public/v3/models/analysis-task.js</a></li>
<li><a href="#trunkWebsitesperfwebkitorgpublicv3modelstestgroupjs">trunk/Websites/perf.webkit.org/public/v3/models/test-group.js</a></li>
<li><a href="#trunkWebsitesperfwebkitorgservertestsapimanifestjs">trunk/Websites/perf.webkit.org/server-tests/api-manifest.js</a></li>
<li><a href="#trunkWebsitesperfwebkitorgtoolsjsdatabasejs">trunk/Websites/perf.webkit.org/tools/js/database.js</a></li>
<li><a href="#trunkWebsitesperfwebkitorgunittestsanalysistasktestsjs">trunk/Websites/perf.webkit.org/unit-tests/analysis-task-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 (213999 => 214000)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Websites/perf.webkit.org/ChangeLog 2017-03-15 19:15:27 UTC (rev 213999)
+++ trunk/Websites/perf.webkit.org/ChangeLog 2017-03-15 19:34:00 UTC (rev 214000)
</span><span class="lines">@@ -1,5 +1,32 @@
</span><span class="cx"> 2017-03-15 Ryosuke Niwa <rniwa@webkit.org>
</span><span class="cx">
</span><ins>+ Fix server tests after r213998 and r213969
+ https://bugs.webkit.org/show_bug.cgi?id=169690
+
+ Reviewed by Antti Koivisto.
+
+ Fixed the existing server tests.
+
+ * public/v3/models/analysis-task.js:
+ (AnalysisTask.prototype._updateRemoteState): Use the relative path from the root so that it works inside tests.
+ (AnalysisTask.prototype.associateBug): Ditto.
+ (AnalysisTask.prototype.dissociateBug): Ditto.
+ (AnalysisTask.prototype.associateCommit): Ditto.
+ (AnalysisTask.prototype.dissociateCommit): Ditto.
+ (AnalysisTask._fetchSubset): Ditto.
+ (AnalysisTask.fetchAll): Ditto.
+ * public/v3/models/test-group.js:
+ (TestGroup.prototype.updateName): Ditto.
+ (TestGroup.prototype.updateHiddenFlag): Ditto.
+ (TestGroup.createAndRefetchTestGroups): Ditto.
+ (TestGroup.cachedFetch): Ditto.
+ * server-tests/api-manifest.js: Reverted an inadvertant change in r213969.
+ * tools/js/database.js:
+ (tableToPrefixMap): Added analysis_strategies.
+ * unit-tests/analysis-task-tests.js: Updated expectations per changes to AnalysisTask.
+
+2017-03-15 Ryosuke Niwa <rniwa@webkit.org>
+
</ins><span class="cx"> Add tests for privileged-api/create-analysis-task and privileged-api/create-test-group
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=169688
</span><span class="cx">
</span></span></pre></div>
<a id="trunkWebsitesperfwebkitorgpublicv3modelsanalysistaskjs"></a>
<div class="modfile"><h4>Modified: trunk/Websites/perf.webkit.org/public/v3/models/analysis-task.js (213999 => 214000)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Websites/perf.webkit.org/public/v3/models/analysis-task.js 2017-03-15 19:15:27 UTC (rev 213999)
+++ trunk/Websites/perf.webkit.org/public/v3/models/analysis-task.js 2017-03-15 19:34:00 UTC (rev 214000)
</span><span class="lines">@@ -81,7 +81,7 @@
</span><span class="cx"> {
</span><span class="cx"> param.task = this.id();
</span><span class="cx"> return PrivilegedAPI.sendRequest('update-analysis-task', param).then(function (data) {
</span><del>- return AnalysisTask.cachedFetch('../api/analysis-tasks', {id: param.task}, true)
</del><ins>+ return AnalysisTask.cachedFetch('/api/analysis-tasks', {id: param.task}, true)
</ins><span class="cx"> .then(AnalysisTask._constructAnalysisTasksFromRawData.bind(AnalysisTask));
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="lines">@@ -96,7 +96,7 @@
</span><span class="cx"> bugTracker: tracker.id(),
</span><span class="cx"> number: bugNumber,
</span><span class="cx"> }).then(function (data) {
</span><del>- return AnalysisTask.cachedFetch('../api/analysis-tasks', {id: id}, true)
</del><ins>+ return AnalysisTask.cachedFetch('/api/analysis-tasks', {id: id}, true)
</ins><span class="cx"> .then(AnalysisTask._constructAnalysisTasksFromRawData.bind(AnalysisTask));
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="lines">@@ -112,7 +112,7 @@
</span><span class="cx"> number: bug.bugNumber(),
</span><span class="cx"> shouldDelete: true,
</span><span class="cx"> }).then(function (data) {
</span><del>- return AnalysisTask.cachedFetch('../api/analysis-tasks', {id: id}, true)
</del><ins>+ return AnalysisTask.cachedFetch('/api/analysis-tasks', {id: id}, true)
</ins><span class="cx"> .then(AnalysisTask._constructAnalysisTasksFromRawData.bind(AnalysisTask));
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="lines">@@ -128,7 +128,7 @@
</span><span class="cx"> revision: revision,
</span><span class="cx"> kind: kind,
</span><span class="cx"> }).then(function (data) {
</span><del>- return AnalysisTask.cachedFetch('../api/analysis-tasks', {id: id}, true)
</del><ins>+ return AnalysisTask.cachedFetch('/api/analysis-tasks', {id: id}, true)
</ins><span class="cx"> .then(AnalysisTask._constructAnalysisTasksFromRawData.bind(AnalysisTask));
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="lines">@@ -141,7 +141,7 @@
</span><span class="cx"> task: id,
</span><span class="cx"> commit: commit.id(),
</span><span class="cx"> }).then(function (data) {
</span><del>- return AnalysisTask.cachedFetch('../api/analysis-tasks', {id: id}, true)
</del><ins>+ return AnalysisTask.cachedFetch('/api/analysis-tasks', {id: id}, true)
</ins><span class="cx"> .then(AnalysisTask._constructAnalysisTasksFromRawData.bind(AnalysisTask));
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="lines">@@ -215,13 +215,13 @@
</span><span class="cx"> {
</span><span class="cx"> if (this._fetchAllPromise)
</span><span class="cx"> return this._fetchAllPromise;
</span><del>- return this.cachedFetch('../api/analysis-tasks', params, noCache).then(this._constructAnalysisTasksFromRawData.bind(this));
</del><ins>+ return this.cachedFetch('/api/analysis-tasks', params, noCache).then(this._constructAnalysisTasksFromRawData.bind(this));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static fetchAll()
</span><span class="cx"> {
</span><span class="cx"> if (!this._fetchAllPromise)
</span><del>- this._fetchAllPromise = RemoteAPI.getJSONWithStatus('../api/analysis-tasks').then(this._constructAnalysisTasksFromRawData.bind(this));
</del><ins>+ this._fetchAllPromise = RemoteAPI.getJSONWithStatus('/api/analysis-tasks').then(this._constructAnalysisTasksFromRawData.bind(this));
</ins><span class="cx"> return this._fetchAllPromise;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkWebsitesperfwebkitorgpublicv3modelstestgroupjs"></a>
<div class="modfile"><h4>Modified: trunk/Websites/perf.webkit.org/public/v3/models/test-group.js (213999 => 214000)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Websites/perf.webkit.org/public/v3/models/test-group.js 2017-03-15 19:15:27 UTC (rev 213999)
+++ trunk/Websites/perf.webkit.org/public/v3/models/test-group.js 2017-03-15 19:34:00 UTC (rev 214000)
</span><span class="lines">@@ -179,7 +179,7 @@
</span><span class="cx"> group: id,
</span><span class="cx"> name: newName,
</span><span class="cx"> }).then(function (data) {
</span><del>- return TestGroup.cachedFetch(`../api/test-groups/${id}`, {}, true)
</del><ins>+ return TestGroup.cachedFetch(`/api/test-groups/${id}`, {}, true)
</ins><span class="cx"> .then(TestGroup._createModelsFromFetchedTestGroups.bind(TestGroup));
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="lines">@@ -192,7 +192,7 @@
</span><span class="cx"> group: id,
</span><span class="cx"> hidden: !!hidden,
</span><span class="cx"> }).then(function (data) {
</span><del>- return TestGroup.cachedFetch(`../api/test-groups/${id}`, {}, true)
</del><ins>+ return TestGroup.cachedFetch(`/api/test-groups/${id}`, {}, true)
</ins><span class="cx"> .then(TestGroup._createModelsFromFetchedTestGroups.bind(TestGroup));
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="lines">@@ -205,13 +205,13 @@
</span><span class="cx"> repetitionCount: repetitionCount,
</span><span class="cx"> commitSets: commitSets,
</span><span class="cx"> }).then((data) => {
</span><del>- return this.cachedFetch('../api/test-groups', {task: task.id()}, true).then((data) => this._createModelsFromFetchedTestGroups(data));
</del><ins>+ return this.cachedFetch('/api/test-groups', {task: task.id()}, true).then((data) => this._createModelsFromFetchedTestGroups(data));
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static fetchByTask(taskId)
</span><span class="cx"> {
</span><del>- return this.cachedFetch('../api/test-groups', {task: taskId}).then(this._createModelsFromFetchedTestGroups.bind(this));
</del><ins>+ return this.cachedFetch('/api/test-groups', {task: taskId}).then(this._createModelsFromFetchedTestGroups.bind(this));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static _createModelsFromFetchedTestGroups(data)
</span></span></pre></div>
<a id="trunkWebsitesperfwebkitorgservertestsapimanifestjs"></a>
<div class="modfile"><h4>Modified: trunk/Websites/perf.webkit.org/server-tests/api-manifest.js (213999 => 214000)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Websites/perf.webkit.org/server-tests/api-manifest.js 2017-03-15 19:15:27 UTC (rev 213999)
+++ trunk/Websites/perf.webkit.org/server-tests/api-manifest.js 2017-03-15 19:34:00 UTC (rev 214000)
</span><span class="lines">@@ -14,7 +14,7 @@
</span><span class="cx"> it("should generate an empty manifest when database is empty", () => {
</span><span class="cx"> return TestServer.remoteAPI().getJSON('/api/manifest').then((manifest) => {
</span><span class="cx"> assert.deepEqual(Object.keys(manifest).sort(), ['all', 'bugTrackers', 'builders', 'dashboard', 'dashboards',
</span><del>- 'elapsedTime', 'fileUploadSizeLimit', 'metrics', 'repositories', 'siteTitle', 'status', 'summaryPages', 'tests', 'triggerables']);
</del><ins>+ 'elapsedTime', 'metrics', 'repositories', 'siteTitle', 'status', 'summaryPages', 'tests', 'triggerables']);
</ins><span class="cx">
</span><span class="cx"> assert.equal(typeof(manifest.elapsedTime), 'number');
</span><span class="cx"> delete manifest.elapsedTime;
</span><span class="lines">@@ -31,7 +31,6 @@
</span><span class="cx"> tests: {},
</span><span class="cx"> triggerables: {},
</span><span class="cx"> summaryPages: [],
</span><del>- fileUploadSizeLimit: 0,
</del><span class="cx"> status: 'OK'
</span><span class="cx"> });
</span><span class="cx"> });
</span></span></pre></div>
<a id="trunkWebsitesperfwebkitorgtoolsjsdatabasejs"></a>
<div class="modfile"><h4>Modified: trunk/Websites/perf.webkit.org/tools/js/database.js (213999 => 214000)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Websites/perf.webkit.org/tools/js/database.js 2017-03-15 19:15:27 UTC (rev 213999)
+++ trunk/Websites/perf.webkit.org/tools/js/database.js 2017-03-15 19:34:00 UTC (rev 214000)
</span><span class="lines">@@ -127,6 +127,7 @@
</span><span class="cx">
</span><span class="cx"> const tableToPrefixMap = {
</span><span class="cx"> 'aggregators': 'aggregator',
</span><ins>+ 'analysis_strategies': 'strategy',
</ins><span class="cx"> 'analysis_tasks': 'task',
</span><span class="cx"> 'analysis_test_groups': 'testgroup',
</span><span class="cx"> 'bug_trackers': 'tracker',
</span></span></pre></div>
<a id="trunkWebsitesperfwebkitorgunittestsanalysistasktestsjs"></a>
<div class="modfile"><h4>Modified: trunk/Websites/perf.webkit.org/unit-tests/analysis-task-tests.js (213999 => 214000)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Websites/perf.webkit.org/unit-tests/analysis-task-tests.js 2017-03-15 19:15:27 UTC (rev 213999)
+++ trunk/Websites/perf.webkit.org/unit-tests/analysis-task-tests.js 2017-03-15 19:34:00 UTC (rev 214000)
</span><span class="lines">@@ -126,7 +126,7 @@
</span><span class="cx"> AnalysisTask.fetchAll().then(() => { callCount++; });
</span><span class="cx"> assert.equal(callCount, 0);
</span><span class="cx"> assert.equal(requests.length, 1);
</span><del>- assert.equal(requests[0].url, '../api/analysis-tasks');
</del><ins>+ assert.equal(requests[0].url, '/api/analysis-tasks');
</ins><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> it('should not request all analysis tasks multiple times', () => {
</span><span class="lines">@@ -134,7 +134,7 @@
</span><span class="cx"> AnalysisTask.fetchAll().then(() => { callCount++; });
</span><span class="cx"> assert.equal(callCount, 0);
</span><span class="cx"> assert.equal(requests.length, 1);
</span><del>- assert.equal(requests[0].url, '../api/analysis-tasks');
</del><ins>+ assert.equal(requests[0].url, '/api/analysis-tasks');
</ins><span class="cx">
</span><span class="cx"> AnalysisTask.fetchAll().then(() => { callCount++; });
</span><span class="cx"> assert.equal(callCount, 0);
</span><span class="lines">@@ -146,7 +146,7 @@
</span><span class="cx"> const promise = AnalysisTask.fetchAll().then(() => { callCount++; });
</span><span class="cx"> assert.equal(callCount, 0);
</span><span class="cx"> assert.equal(requests.length, 1);
</span><del>- assert.equal(requests[0].url, '../api/analysis-tasks');
</del><ins>+ assert.equal(requests[0].url, '/api/analysis-tasks');
</ins><span class="cx">
</span><span class="cx"> requests[0].resolve(sampleAnalysisTask());
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>