Changeset 207492 in webkit

Timestamp:

Oct 18, 2016 3:22:55 PM (8 years ago)

Author:

Dewei Zhu

Message:

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):

Location:

trunk/Websites/perf.webkit.org

Files:

• ChangeLog (modified) (1 diff)
• public/include/manifest.php (modified) (1 diff)
• server-tests/api-manifest.js (modified) (2 diffs)
• server-tests/resources/test-server.js (modified) (2 diffs)
• server-tests/tools-buildbot-triggerable-tests.js (modified) (1 diff)

trunk/Websites/perf.webkit.org/ChangeLog

@@ +1 @@
+2016-10-18  Dewei Zhu  <dewei_zhu@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_zhu@apple.com>
 

trunk/Websites/perf.webkit.org/public/include/manifest.php

@@ -42 +42 @@
             'bugTrackers' => (object)$this->bug_trackers($repositories_table),
             'dashboards' => (object)config('dashboards'),
-            'summaryPages' => (object)config('summaryPages'),
+            'summaryPages' => config('summaryPages'),
         );
 

trunk/Websites/perf.webkit.org/server-tests/api-manifest.js

@@ -19 +19 @@
         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: {},
@@ -34 +34 @@
                 repositories: {},
                 tests: {},
-                summary: {},
+                summaryPages: [],
                 status: 'OK'
             });

trunk/Websites/perf.webkit.org/server-tests/resources/test-server.js

@@ -32 +32 @@
 
     start()
-    {        
+    {
         let testConfigContent = this.testConfig();
         fs.writeFileSync(this._testConfigPath, JSON.stringify(testConfigContent, null, '    '));
@@ -82 +82 @@
             'clusterSize': [0, 2, 0],
             'defaultDashboard': [[]],
-            'dashboards': {}
+            'dashboards': {},
+            'summaryPages': []
         }
     }

trunk/Websites/perf.webkit.org/server-tests/tools-buildbot-triggerable-tests.js

@@ -771 +771 @@
                 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);