Changeset 263267 in webkit

Timestamp:

Jun 19, 2020, 8:31:10 AM (5 years ago)

Author:

aakash_jain@apple.com

Message:

Improve handling of trac downtime by commit-queue
​https://bugs.webkit.org/show_bug.cgi?id=213377

Reviewed by Jonathan Bedard.

• BuildSlaveSupport/ews-build/steps.py: Load contributors.json from disk when loading from trac fails.

(ValidateCommiterAndReviewer.load_contributors_from_disk):
(ValidateCommiterAndReviewer.load_contributors_from_trac):
(ValidateCommiterAndReviewer.load_contributors):

• BuildSlaveSupport/ews-build/steps_unittest.py: Added unit-test

Location:

trunk/Tools

Files:

• BuildSlaveSupport/ews-build/steps.py (modified) (2 diffs)
• BuildSlaveSupport/ews-build/steps_unittest.py (modified) (2 diffs)
• ChangeLog (modified) (1 diff)

trunk/Tools/BuildSlaveSupport/ews-build/steps.py

@@ -679 +679 @@
     contributors = {}
 
-    def load_contributors(self):
+    def load_contributors_from_disk(self):
+        cwd = os.path.abspath(os.path.dirname(__file__))
+        tools_dir_path = os.path.dirname(os.path.dirname(cwd))
+        contributors_path = os.path.join(tools_dir_path, 'Scripts/webkitpy/common/config/contributors.json')
+        try:
+            return json.load(open(contributors_path))
+        except Exception as e:
+            self._addToLog('stdio', 'Failed to load {}\n'.format(contributors_path))
+            return {}
+
+    def load_contributors_from_trac(self):
         try:
             response = requests.get(self.url_text)
@@ -685 +695 @@
                 self._addToLog('stdio', 'Failed to access {} with status code: {}\n'.format(self.url_text, response.status_code))
                 return {}
+            return response.json()
         except Exception as e:
             self._addToLog('stdio', 'Failed to access {url}\n'.format(url=self.url_text))
             return {}
 
-        contributors_json = response.json()
+    def load_contributors(self):
+        contributors_json = self.load_contributors_from_trac()
+        if not contributors_json:
+            contributors_json = self.load_contributors_from_disk()
+
         contributors = {}
         for key, value in contributors_json.iteritems():

trunk/Tools/BuildSlaveSupport/ews-build/steps_unittest.py

@@ -25 +25 @@
 import os
 import shutil
+import sys
 import tempfile
 
@@ -3426 +3427 @@
         return self.runStep()
 
+    def test_load_contributors_from_disk(self):
+        ValidateCommiterAndReviewer._addToLog = lambda cls, logtype, log: sys.stdout.write(log)
+        contributors = ValidateCommiterAndReviewer().load_contributors_from_disk()
+        self.assertEqual(contributors['Aakash Jain']['nicks'], ['aakash_jain'])
+
 
 class TestCheckPatchStatusOnEWSQueues(BuildStepMixinAdditions, unittest.TestCase):

trunk/Tools/ChangeLog

@@ +1 @@
+2020-06-19  Aakash Jain  <aakash_jain@apple.com>
+
+        Improve handling of trac downtime by commit-queue
+        https://bugs.webkit.org/show_bug.cgi?id=213377
+
+        Reviewed by Jonathan Bedard.
+
+        * BuildSlaveSupport/ews-build/steps.py: Load contributors.json from disk when loading from trac fails.
+        (ValidateCommiterAndReviewer.load_contributors_from_disk):
+        (ValidateCommiterAndReviewer.load_contributors_from_trac):
+        (ValidateCommiterAndReviewer.load_contributors):
+        * BuildSlaveSupport/ews-build/steps_unittest.py: Added unit-test
+
 2020-06-19  Lauro Moura  <lmoura@igalia.com>