Unreviewed test fixes after r179037, r179591, and r179763.

* tests/admin-regenerate-manifest.js:
* tests/admin-reprocess-report.js:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@180442 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Websites/perf.webkit.org/ChangeLog b/Websites/perf.webkit.org/ChangeLog
index dbc92480f5eb41942b9c76b02e6f9498d5b5ff84..3f20b4b0660cccc8cf8bedbc696547525af1e474 100644 (file)
--- a/Websites/perf.webkit.org/ChangeLog
+++ b/Websites/perf.webkit.org/ChangeLog
@@ -1,3 +1,10 @@
+2015-02-20  Ryosuke Niwa  <rniwa@webkit.org>
+
+        Unreviewed test fixes after r179037, r179591, and r179763.
+
+        * tests/admin-regenerate-manifest.js:
+        * tests/admin-reprocess-report.js:
+
 2015-02-19  Ryosuke Niwa  <rniwa@webkit.org>
 
         Relationship between A/B testing results are unclear

diff --git a/Websites/perf.webkit.org/tests/admin-regenerate-manifest.js b/Websites/perf.webkit.org/tests/admin-regenerate-manifest.js
index 769f358b78b88f9d9dc9d3a7aff6bd6331186641..f4dc6ae1fa0a470dcfbc6588f8860a2a694b081b 100644 (file)
--- a/Websites/perf.webkit.org/tests/admin-regenerate-manifest.js
+++ b/Websites/perf.webkit.org/tests/admin-regenerate-manifest.js
@@ -7,6 +7,7 @@ describe("/admin/regenerate-manifest", function () {
                 assert.equal(response.statusCode, 200);
                 var manifest = JSON.parse(response.responseText);
                 delete manifest.defaultDashboard;
+                delete manifest.dashboards;
                 assert.deepEqual(manifest, {
                     all: [],
                     bugTrackers: [],
@@ -47,11 +48,11 @@ describe("/admin/regenerate-manifest", function () {
                             assert.equal(response.statusCode, 200);
                             var manifest = JSON.parse(response.responseText);
                             assert.deepEqual(manifest['repositories'], {
-                                'WebKit': { url: 'trac.webkit.org', blameUrl: null, hasReportedCommits: false },
-                                'Chromium': { url: null, blameUrl: 'SomeBlameURL', hasReportedCommits: false }
+                                1: { name: 'WebKit', url: 'trac.webkit.org', blameUrl: null, hasReportedCommits: false },
+                                2: { name: 'Chromium', url: null, blameUrl: 'SomeBlameURL', hasReportedCommits: false }
                             });
-                            assert.deepEqual(manifest['bugTrackers'][3], {name: 'Bugzilla', bugUrl: null, newBugUrl: null, repositories: ['WebKit']});
-                            assert.deepEqual(manifest['bugTrackers'][4], {name: 'Issue Tracker', bugUrl: null, newBugUrl: null, repositories: ['WebKit', 'Chromium']});
+                            assert.deepEqual(manifest['bugTrackers'][3], {name: 'Bugzilla', bugUrl: null, newBugUrl: null, repositories: ['1']});
+                            assert.deepEqual(manifest['bugTrackers'][4], {name: 'Issue Tracker', bugUrl: null, newBugUrl: null, repositories: ['1', '2']});
                             notifyDone();
                         });
                     });

diff --git a/Websites/perf.webkit.org/tests/admin-reprocess-report.js b/Websites/perf.webkit.org/tests/admin-reprocess-report.js
index 736d8d0125dbbcbae5e204a3423ce2010a52f08d..61a9cad786737242d24a44dce44677e12cf28c63 100644 (file)
--- a/Websites/perf.webkit.org/tests/admin-reprocess-report.js
+++ b/Websites/perf.webkit.org/tests/admin-reprocess-report.js
@@ -28,7 +28,7 @@ describe("/admin/reprocess-report", function () {
                     queryAndFetchAll('SELECT * FROM reports', [], function (reportRows) {
                         assert.equal(reportRows.length, 1);
                         assert.equal(reportRows[0]['report_build_number'], 1986);
-                        queryAndFetchAll('DELETE FROM builds; SELECT * FROM builds', [], function (buildRows) {
+                        queryAndFetchAll('UPDATE reports SET report_build = NULL; DELETE FROM builds; SELECT * FROM builds', [], function (buildRows) {
                             assert.equal(buildRows.length, 0);
                             var reportId = reportRows[0]['report_id'];
                             httpGet('/admin/reprocess-report?report=' + reportId, function (response) {
@@ -54,13 +54,16 @@ describe("/admin/reprocess-report", function () {
                 assert.equal(JSON.parse(response.responseText)['status'], 'OK');
                 queryAndFetchAll('SELECT * FROM reports', [], function (originalReprotRows) {
                     assert.equal(originalReprotRows.length, 1);
-                    queryAndFetchAll('DELETE FROM builds', [], function () {
+                    queryAndFetchAll('UPDATE reports SET report_build = NULL; DELETE FROM builds', [], function () {
                         httpGet('/admin/reprocess-report?report=' + originalReprotRows[0]['report_id'], function (response) {
                             assert.equal(response.statusCode, 200);
                             assert.equal(JSON.parse(response.responseText)['status'], 'OK');
                             queryAndFetchAll('SELECT * FROM reports', [], function (reportRows) {
                                 originalReprotRows[0]['report_committed_at'] = null;
                                 reportRows[0]['report_committed_at'] = null;
+                                assert.notEqual(originalReprotRows[0]['report_build'], reportRows[0]['report_build']);
+                                originalReprotRows[0]['report_build'] = null;
+                                reportRows[0]['report_build'] = null;
                                 assert.deepEqual(reportRows, originalReprotRows);
                                 notifyDone();
                             });