Title: [281938] trunk/Tools
- Revision
- 281938
- Author
- jbed...@apple.com
- Date
- 2021-09-02 11:31:12 -0700 (Thu, 02 Sep 2021)
Log Message
[contributors.json] Relocation (Part 5)
https://bugs.webkit.org/show_bug.cgi?id=229690
<rdar://problem/82552403>
Reviewed by Aakash Jain.
* CISupport/ews-build/steps.py:
(ValidateCommiterAndReviewer): Pull from metadata/contributors.json.
(ValidateCommiterAndReviewer.load_contributors_from_disk): Ditto.
(ValidateCommiterAndReviewer.load_contributors): Parse contributors.json as list instead of dictionary.
* CISupport/ews-build/steps_unittest.py:
Modified Paths
Diff
Modified: trunk/Tools/CISupport/ews-build/steps.py (281937 => 281938)
--- trunk/Tools/CISupport/ews-build/steps.py 2021-09-02 17:51:43 UTC (rev 281937)
+++ trunk/Tools/CISupport/ews-build/steps.py 2021-09-02 18:31:12 UTC (rev 281938)
@@ -899,13 +899,13 @@
class ValidateCommiterAndReviewer(buildstep.BuildStep):
name = 'validate-commiter-and-reviewer'
descriptionDone = ['Validated commiter and reviewer']
- url = ''
+ url = ''
contributors = {}
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')
+ repo_root = os.path.dirname(os.path.dirname(os.path.dirname(cwd)))
+ contributors_path = os.path.join(repo_root, 'metadata/contributors.json')
try:
with open(contributors_path, 'rb') as contributors_json:
return json.load(contributors_json)
@@ -930,11 +930,12 @@
contributors_json = self.load_contributors_from_disk()
contributors = {}
- for key, value in contributors_json.items():
+ for value in contributors_json:
+ name = value.get('name')
emails = value.get('emails')
- if emails:
+ if name and emails:
bugzilla_email = emails[0].lower() # We're requiring that the first email is the primary bugzilla email
- contributors[bugzilla_email] = {'name': key, 'status': value.get('status')}
+ contributors[bugzilla_email] = {'name': name, 'status': value.get('status')}
return contributors
@defer.inlineCallbacks
Modified: trunk/Tools/CISupport/ews-build/steps_unittest.py (281937 => 281938)
--- trunk/Tools/CISupport/ews-build/steps_unittest.py 2021-09-02 17:51:43 UTC (rev 281937)
+++ trunk/Tools/CISupport/ews-build/steps_unittest.py 2021-09-02 18:31:12 UTC (rev 281938)
@@ -4216,8 +4216,8 @@
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'])
+ contributors = filter(lambda element: element.get('name') == 'Aakash Jain', ValidateCommiterAndReviewer().load_contributors_from_disk())
+ self.assertEqual(list(contributors)[0]['emails'], ['aakash_j...@apple.com'])
class TestCheckPatchStatusOnEWSQueues(BuildStepMixinAdditions, unittest.TestCase):
Modified: trunk/Tools/ChangeLog (281937 => 281938)
--- trunk/Tools/ChangeLog 2021-09-02 17:51:43 UTC (rev 281937)
+++ trunk/Tools/ChangeLog 2021-09-02 18:31:12 UTC (rev 281938)
@@ -1,3 +1,17 @@
+2021-09-02 Jonathan Bedard <jbed...@apple.com>
+
+ [contributors.json] Relocation (Part 5)
+ https://bugs.webkit.org/show_bug.cgi?id=229690
+ <rdar://problem/82552403>
+
+ Reviewed by Aakash Jain.
+
+ * CISupport/ews-build/steps.py:
+ (ValidateCommiterAndReviewer): Pull from metadata/contributors.json.
+ (ValidateCommiterAndReviewer.load_contributors_from_disk): Ditto.
+ (ValidateCommiterAndReviewer.load_contributors): Parse contributors.json as list instead of dictionary.
+ * CISupport/ews-build/steps_unittest.py:
+
2021-09-02 Lauro Moura <lmo...@igalia.com>
[webkitcorepy] Evaluate default Editor to false when not found
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
