Changeset 271361 in webkit

Timestamp:

Jan 11, 2021 8:44:31 AM (3 years ago)

Author:

aakash_jain@apple.com

Message:

[ews] Add python 3 support - part 1
​https://bugs.webkit.org/show_bug.cgi?id=220510

Reviewed by Jonathan Bedard.

• CISupport/ews-build/email_unittest.py:
• CISupport/ews-build/loadConfig.py:
• CISupport/ews-build/loadConfig_unittest.py:

Location:

trunk/Tools

Files:

• CISupport/ews-build/email_unittest.py (modified) (1 diff)
• CISupport/ews-build/loadConfig.py (modified) (1 diff)
• CISupport/ews-build/loadConfig_unittest.py (modified) (2 diffs)
• ChangeLog (modified) (1 diff)

trunk/Tools/CISupport/ews-build/email_unittest.py

@@ -39 +39 @@
         valid_email_categories = ['ADMIN_EMAILS', 'APPLE_BOT_WATCHERS_EMAILS', 'EMAIL_IDS_TO_UNSUBSCRIBE', 'IGALIA_JSC_TEAM_EMAILS', 'IGALIA_GTK_WPE_EMAILS']
         for category in valid_email_categories:
-            self.assertTrue(category in emails.keys())
+            self.assertTrue(category in list(emails.keys()))
 
 

trunk/Tools/CISupport/ews-build/loadConfig.py

@@ -186 +186 @@
     For e.g. we don't want '11'as tag for builder iOS-11-Simulator-EWS
     """
-    invalid_tags = [str(i) for i in xrange(0, 20)]
+    invalid_tags = [str(i) for i in range(0, 20)]
     invalid_tags.extend(['EWS', 'TryBot'])
     return invalid_tags

trunk/Tools/CISupport/ews-build/loadConfig_unittest.py

@@ -90 +90 @@
 
         for builder in config['builders']:
-            for key, value in builder.iteritems():
+            for key, value in builder.items():
                 if key == 'triggered_by':
                     self.assertTrue(len(value) == 1, 'triggered_by "{}" is invalid, it should contain a single trigger.'.format(value))
-                    self.assertTrue(value[0] in schedulers_to_buildername_map.keys(),
+                    self.assertTrue(value[0] in list(schedulers_to_buildername_map.keys()),
                                     'triggered_by "{}" for builder "{}" is not listed in schedulers section.'.format(value[0], builder['name']))
 
@@ -128 +128 @@
 
     def test_tags_type(self):
-        tags = loadConfig.getTagsForBuilder({'name': u'iOS-11-EWS'})
+        tags = loadConfig.getTagsForBuilder({'name': 'iOS-11-EWS'})
         self.assertEqual(tags, ['iOS'])
         self.assertEqual(type(tags[0]), str)

trunk/Tools/ChangeLog

@@ +1 @@
+2021-01-11  Aakash Jain  <aakash_jain@apple.com>
+
+        [ews] Add python 3 support - part 1
+        https://bugs.webkit.org/show_bug.cgi?id=220510
+
+        Reviewed by Jonathan Bedard.
+
+        * CISupport/ews-build/email_unittest.py:
+        * CISupport/ews-build/loadConfig.py:
+        * CISupport/ews-build/loadConfig_unittest.py:
+
 2021-01-11  Yoshiaki Jitsukawa  <yoshiaki.jitsukawa@sony.com>