Title: [242884] trunk/Tools
Revision
242884
Author
aakash_j...@apple.com
Date
2019-03-13 10:03:42 -0700 (Wed, 13 Mar 2019)

Log Message

[ews-app] Use Buildbot result code variables
https://bugs.webkit.org/show_bug.cgi?id=195668

Reviewed by Alexey Proskuryakov.

* BuildSlaveSupport/ews-app/ews/common/buildbot.py:
(Buildbot): Added Buildbot result code variables.
* BuildSlaveSupport/ews-app/ews/views/statusbubble.py:
(StatusBubble._build_bubble): Used Buildbot result code variables.

Modified Paths

Diff

Modified: trunk/Tools/BuildSlaveSupport/ews-app/ews/common/buildbot.py (242883 => 242884)


--- trunk/Tools/BuildSlaveSupport/ews-app/ews/common/buildbot.py	2019-03-13 16:08:15 UTC (rev 242883)
+++ trunk/Tools/BuildSlaveSupport/ews-app/ews/common/buildbot.py	2019-03-13 17:03:42 UTC (rev 242884)
@@ -20,6 +20,8 @@
 # OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+from future.utils import lrange
+
 import logging
 import os
 import re
@@ -32,6 +34,10 @@
 
 
 class Buildbot():
+    # Buildbot status codes referenced from https://github.com/buildbot/buildbot/blob/master/master/buildbot/process/results.py
+    ALL_RESULTS = lrange(7)
+    SUCCESS, WARNINGS, FAILURE, SKIPPED, EXCEPTION, RETRY, CANCELLED = ALL_RESULTS
+
     @classmethod
     def send_patch_to_buildbot(cls, patch_path, properties=[]):
         command = ['buildbot', 'try',

Modified: trunk/Tools/BuildSlaveSupport/ews-app/ews/views/statusbubble.py (242883 => 242884)


--- trunk/Tools/BuildSlaveSupport/ews-app/ews/views/statusbubble.py	2019-03-13 16:08:15 UTC (rev 242883)
+++ trunk/Tools/BuildSlaveSupport/ews-app/ews/views/statusbubble.py	2019-03-13 17:03:42 UTC (rev 242884)
@@ -28,6 +28,7 @@
 from django.shortcuts import render
 from django.views import View
 from django.views.decorators.clickjacking import xframe_options_exempt
+from ews.common.buildbot import Buildbot
 from ews.models.patch import Patch
 import ews.config as config
 
@@ -57,17 +58,17 @@
         bubble["details_message"] = '{}\n{}'.format(builder_full_name, build.state_string)
         if build.result is None:
             bubble["state"] = "started"
-        elif build.result == 0:  # SUCCESS
+        elif build.result == Buildbot.SUCCESS:
             bubble["state"] = "pass"
-        elif build.result == 1:  # WARNINGS
+        elif build.result == Buildbot.WARNINGS:
             bubble["state"] = "pass"
-        elif build.result == 2:  # FAILURE
+        elif build.result == Buildbot.FAILURE:
             bubble["state"] = "fail"
-        elif build.result == 3:  # SKIPPED
+        elif build.result == Buildbot.SKIPPED:
             bubble["state"] = "none"
-        elif build.result == 4:  # EXCEPTION
+        elif build.result == Buildbot.EXCEPTION:
             bubble["state"] = "error"
-        elif build.result == 5:  # RETRY
+        elif build.result == Buildbot.RETRY:
             bubble["state"] = "provisional-fail"
         else:
             bubble["state"] = "fail"
@@ -85,7 +86,7 @@
         return [build for build in patch.build_set.all() if build.builder_display_name == queue]
 
     def _should_show_bubble_for_build(self, build):
-        if build and build.result == 3 and re.search(r'Patch .* doesn\'t have relevant changes', build.state_string):
+        if build and build.result == Buildbot.SKIPPED and re.search(r'Patch .* doesn\'t have relevant changes', build.state_string):
             return False
         return True
 

Modified: trunk/Tools/ChangeLog (242883 => 242884)


--- trunk/Tools/ChangeLog	2019-03-13 16:08:15 UTC (rev 242883)
+++ trunk/Tools/ChangeLog	2019-03-13 17:03:42 UTC (rev 242884)
@@ -1,3 +1,15 @@
+2019-03-13  Aakash Jain  <aakash_j...@apple.com>
+
+        [ews-app] Use Buildbot result code variables
+        https://bugs.webkit.org/show_bug.cgi?id=195668
+
+        Reviewed by Alexey Proskuryakov.
+
+        * BuildSlaveSupport/ews-app/ews/common/buildbot.py:
+        (Buildbot): Added Buildbot result code variables.
+        * BuildSlaveSupport/ews-app/ews/views/statusbubble.py:
+        (StatusBubble._build_bubble): Used Buildbot result code variables.
+
 2019-03-13  Thibault Saunier  <tsaun...@igalia.com>
 
         [Flatpak] Expand submodule recursively
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to