Title: [271361] trunk/Tools
- Revision
- 271361
- Author
- [email protected]
- Date
- 2021-01-11 08:44:31 -0800 (Mon, 11 Jan 2021)
Log 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:
Modified Paths
Diff
Modified: trunk/Tools/CISupport/ews-build/email_unittest.py (271360 => 271361)
--- trunk/Tools/CISupport/ews-build/email_unittest.py 2021-01-11 15:11:38 UTC (rev 271360)
+++ trunk/Tools/CISupport/ews-build/email_unittest.py 2021-01-11 16:44:31 UTC (rev 271361)
@@ -38,7 +38,7 @@
emails = json.load(open(os.path.join(cwd, 'emails.json')))
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()))
if __name__ == '__main__':
Modified: trunk/Tools/CISupport/ews-build/loadConfig.py (271360 => 271361)
--- trunk/Tools/CISupport/ews-build/loadConfig.py 2021-01-11 15:11:38 UTC (rev 271360)
+++ trunk/Tools/CISupport/ews-build/loadConfig.py 2021-01-11 16:44:31 UTC (rev 271361)
@@ -185,7 +185,7 @@
We generate a list of tags by splitting the builder name. We do not want certain words as tag.
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
Modified: trunk/Tools/CISupport/ews-build/loadConfig_unittest.py (271360 => 271361)
--- trunk/Tools/CISupport/ews-build/loadConfig_unittest.py 2021-01-11 15:11:38 UTC (rev 271360)
+++ trunk/Tools/CISupport/ews-build/loadConfig_unittest.py 2021-01-11 16:44:31 UTC (rev 271361)
@@ -89,10 +89,10 @@
schedulers_to_buildername_map[scheduler['name']] = scheduler['builderNames']
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']))
# Ensure that the triggered_by is correct, verify by matching that the builder for the triggered_by scheduler actually triggers current builder
@@ -127,7 +127,7 @@
self.verifyTags('macOS-High-Sierra-Release-32bit-WK2-EWS', ['macOS', 'High', 'Sierra', 'Release', 'WK2', '32bit'])
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)
Modified: trunk/Tools/ChangeLog (271360 => 271361)
--- trunk/Tools/ChangeLog 2021-01-11 15:11:38 UTC (rev 271360)
+++ trunk/Tools/ChangeLog 2021-01-11 16:44:31 UTC (rev 271361)
@@ -1,3 +1,14 @@
+2021-01-11 Aakash Jain <[email protected]>
+
+ [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 <[email protected]>
[PlayStation] Add MiniBrowser
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
