Modified: trunk/Tools/BuildSlaveSupport/ews-build/loadConfig.py (268730 => 268731)
--- trunk/Tools/BuildSlaveSupport/ews-build/loadConfig.py 2020-10-20 15:37:24 UTC (rev 268730)
+++ trunk/Tools/BuildSlaveSupport/ews-build/loadConfig.py 2020-10-20 15:42:20 UTC (rev 268731)
@@ -183,19 +183,19 @@
builder['name'], builder['platform'], worker['name'], worker['platform']))
-def getBlackListedTags():
+def getInvalidTags():
"""
- We maintain a blacklist of words which we do not want to display as tag in buildbot.
+ We maintain a list of words which we do not want to display as tag in buildbot.
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
"""
- tags_blacklist = [str(i) for i in xrange(0, 20)]
- tags_blacklist.extend(['EWS', 'TryBot'])
- return tags_blacklist
+ invalid_tags = [str(i) for i in xrange(0, 20)]
+ invalid_tags.extend(['EWS', 'TryBot'])
+ return invalid_tags
def getValidTags(tags):
- return list(set(tags) - set(getBlackListedTags()))
+ return list(set(tags) - set(getInvalidTags()))
def getTagsForBuilder(builder):
Modified: trunk/Tools/BuildSlaveSupport/ews-build/loadConfig_unittest.py (268730 => 268731)
--- trunk/Tools/BuildSlaveSupport/ews-build/loadConfig_unittest.py 2020-10-20 15:37:24 UTC (rev 268730)
+++ trunk/Tools/BuildSlaveSupport/ews-build/loadConfig_unittest.py 2020-10-20 15:42:20 UTC (rev 268731)
@@ -131,11 +131,11 @@
self.assertEqual(tags, ['iOS'])
self.assertEqual(type(tags[0]), str)
- def test_getBlackListedTags(self):
- blacklistedTags = loadConfig.getBlackListedTags()
+ def test_getInvalidTags(self):
+ invalidTags = loadConfig.getInvalidTags()
expectedTags = ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '10',
'11', '12', '13', '14', '15', '16', '17', '18', '19', 'EWS', 'TryBot']
- self.assertEqual(blacklistedTags, expectedTags)
+ self.assertEqual(invalidTags, expectedTags)
class TestcheckValidWorker(unittest.TestCase):
Modified: trunk/Tools/ChangeLog (268730 => 268731)
--- trunk/Tools/ChangeLog 2020-10-20 15:37:24 UTC (rev 268730)
+++ trunk/Tools/ChangeLog 2020-10-20 15:42:20 UTC (rev 268731)
@@ -1,3 +1,16 @@
+2020-10-20 Aakash Jain <[email protected]>
+
+ [ews] Remove blacklist terminology
+ https://bugs.webkit.org/show_bug.cgi?id=217953
+
+ Reviewed by Jonathan Bedard.
+
+ * BuildSlaveSupport/ews-build/loadConfig.py:
+ (getInvalidTags):
+ (getValidTags):
+ * BuildSlaveSupport/ews-build/loadConfig_unittest.py:
+ (TagsForBuilderTest.test_getInvalidTags):
+
2020-10-20 Philippe Normand <[email protected]>
Unreviewed, partial revert of r268721.
