Diff
Modified: trunk/Websites/perf.webkit.org/ChangeLog (207491 => 207492)
--- trunk/Websites/perf.webkit.org/ChangeLog 2016-10-18 21:28:58 UTC (rev 207491)
+++ trunk/Websites/perf.webkit.org/ChangeLog 2016-10-18 22:22:55 UTC (rev 207492)
@@ -1,3 +1,22 @@
+2016-10-18 Dewei Zhu <dewei_...@apple.com>
+
+ Update test cases for change r206465.
+ https://bugs.webkit.org/show_bug.cgi?id=163618
+
+ Reviewed by Ryosuke Niwa.
+
+ Update test case for change r206465 which added support for multiple summary pages.
+ Use deepStrictEqual instead of deepEqual as deepEqual will not complain in the case like 'deepEqual([],{})'.
+ Fix a test failure in tools-buildbot-triggerable-tests.js.
+ Fix a bug in generating manifest.
+
+ * config.json:
+ * public/include/manifest.php:
+ * server-tests/api-manifest.js:
+ (TestServer.remoteAPI.getJSON.string_appeared_here.then):
+ * server-tests/tools-buildbot-triggerable-tests.js:
+ (then):
+
2016-09-27 Dewei Zhu <dewei_...@apple.com>
Extend perf dashboard to support multiple summary pages.
Modified: trunk/Websites/perf.webkit.org/public/include/manifest.php (207491 => 207492)
--- trunk/Websites/perf.webkit.org/public/include/manifest.php 2016-10-18 21:28:58 UTC (rev 207491)
+++ trunk/Websites/perf.webkit.org/public/include/manifest.php 2016-10-18 22:22:55 UTC (rev 207492)
@@ -41,7 +41,7 @@
'builders' => (object)$this->builders(),
'bugTrackers' => (object)$this->bug_trackers($repositories_table),
'dashboards' => (object)config('dashboards'),
- 'summaryPages' => (object)config('summaryPages'),
+ 'summaryPages' => config('summaryPages'),
);
$this->manifest['elapsedTime'] = (microtime(true) - $start_time) * 1000;
Modified: trunk/Websites/perf.webkit.org/server-tests/api-manifest.js (207491 => 207492)
--- trunk/Websites/perf.webkit.org/server-tests/api-manifest.js 2016-10-18 21:28:58 UTC (rev 207491)
+++ trunk/Websites/perf.webkit.org/server-tests/api-manifest.js 2016-10-18 22:22:55 UTC (rev 207492)
@@ -18,12 +18,12 @@
it("should generate an empty manifest when database is empty", function (done) {
TestServer.remoteAPI().getJSON('/api/manifest').then(function (manifest) {
assert.deepEqual(Object.keys(manifest).sort(), ['all', 'bugTrackers', 'builders', 'dashboard', 'dashboards',
- 'elapsedTime', 'metrics', 'repositories', 'siteTitle', 'status', 'summary', 'tests']);
+ 'elapsedTime', 'metrics', 'repositories', 'siteTitle', 'status', 'summaryPages', 'tests']);
assert.equal(typeof(manifest.elapsedTime), 'number');
delete manifest.elapsedTime;
- assert.deepEqual(manifest, {
+ assert.deepStrictEqual(manifest, {
siteTitle: TestServer.testConfig().siteTitle,
all: {},
bugTrackers: {},
@@ -33,7 +33,7 @@
metrics: {},
repositories: {},
tests: {},
- summary: {},
+ summaryPages: [],
status: 'OK'
});
done();
Modified: trunk/Websites/perf.webkit.org/server-tests/resources/test-server.js (207491 => 207492)
--- trunk/Websites/perf.webkit.org/server-tests/resources/test-server.js 2016-10-18 21:28:58 UTC (rev 207491)
+++ trunk/Websites/perf.webkit.org/server-tests/resources/test-server.js 2016-10-18 22:22:55 UTC (rev 207492)
@@ -31,7 +31,7 @@
}
start()
- {
+ {
let testConfigContent = this.testConfig();
fs.writeFileSync(this._testConfigPath, JSON.stringify(testConfigContent, null, ' '));
@@ -81,7 +81,8 @@
'clusterStart': [2000, 1, 1, 0, 0],
'clusterSize': [0, 2, 0],
'defaultDashboard': [[]],
- 'dashboards': {}
+ 'dashboards': {},
+ 'summaryPages': []
}
}
Modified: trunk/Websites/perf.webkit.org/server-tests/tools-buildbot-triggerable-tests.js (207491 => 207492)
--- trunk/Websites/perf.webkit.org/server-tests/tools-buildbot-triggerable-tests.js 2016-10-18 21:28:58 UTC (rev 207491)
+++ trunk/Websites/perf.webkit.org/server-tests/tools-buildbot-triggerable-tests.js 2016-10-18 22:22:55 UTC (rev 207492)
@@ -770,6 +770,7 @@
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');
+ return MockRemoteAPI.waitForRequest();
}).then(function () {
assert.equal(MockRemoteAPI.requests.length, 4);
assert.equal(MockRemoteAPI.requests[3].method, 'GET');
