Fix a bug that platform groups cannot be updated on 'admin/platform'.

dewei-zhu · dewei-zhu · commit 9be763abed3b · 2020-11-21T00:51:51.000Z
https://bugs.webkit.org/show_bug.cgi?id=219118 Reviewed by Ryosuke Niwa. Admins should be able to update platform group on 'admin/platform'. Update the assertion on BuildbotTriggerable._pullBuildbotOnAllSyncers so that when there is no corresponding entry in buildRequestByGroup, the test group for the request should be finished. * public/admin/platforms.php: * tools/js/buildbot-triggerable.js: Updated the assert statement. (BuildbotTriggerable.prototype._pullBuildbotOnAllSyncers): Canonical link: https://commits.webkit.org/231847@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@270138 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Websites/perf.webkit.org/ChangeLog b/Websites/perf.webkit.org/ChangeLog
@@ -1,3 +1,18 @@
+2020-11-18  Dewei Zhu  <dewei_zhu@apple.com>
+
+        Fix a bug that platform groups cannot be updated on 'admin/platform'.
+        https://bugs.webkit.org/show_bug.cgi?id=219118
+
+        Reviewed by Ryosuke Niwa.
+
+        Admins should be able to update platform group on 'admin/platform'.
+        Update the assertion on BuildbotTriggerable._pullBuildbotOnAllSyncers so that when there is no
+        corresponding entry in buildRequestByGroup, the test group for the request should be finished.
+
+        * public/admin/platforms.php:
+        * tools/js/buildbot-triggerable.js: Updated the assert statement.
+        (BuildbotTriggerable.prototype._pullBuildbotOnAllSyncers):
+
 2020-11-16  Dewei Zhu  <dewei_zhu@apple.com>
 
         BuildbotTriggerable should not process a completed build request from a completed test group.
diff --git a/Websites/perf.webkit.org/public/admin/platforms.php b/Websites/perf.webkit.org/public/admin/platforms.php
@@ -59,9 +59,8 @@ function merge_platforms($platform_to_merge, $destination_platform) {
 if ($db) {
     if ($action == 'update') {
         if (update_field('platforms', 'platform', 'name')
-            || update_boolean_field('platforms', 'platform', 'hidden')
-            || update_field('platforms', 'platform', 'hidden')
-            || update_field('platforms', 'platform', 'group'))
+            || update_field('platforms', 'platform', 'group')
+            || update_boolean_field('platforms', 'platform', 'hidden'))
             regenerate_manifest();
         else
             notice('Invalid parameters.');
diff --git a/Websites/perf.webkit.org/tools/js/buildbot-triggerable.js b/Websites/perf.webkit.org/tools/js/buildbot-triggerable.js
@@ -179,7 +179,7 @@ class BuildbotTriggerable {
 
                     const info = buildReqeustsByGroup.get(request.testGroupId());
                     if (!info) {
-                        assert(request.hasFinished());
+                        assert(request.testGroup().hasFinished());
                         continue;
                     }
 

Original file line number	Diff line number	Diff line change
`@@ -179,7 +179,7 @@ class BuildbotTriggerable {`
`179`	`179`
`180`	`180`	`const info = buildReqeustsByGroup.get(request.testGroupId());`
`181`	`181`	`if (!info) {`
`182`		`- assert(request.hasFinished());`
	`182`	`+ assert(request.testGroup().hasFinished());`
`183`	`183`	`continue;`
`184`	`184`	`}`
`185`	`185`