Diff
Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/buildbot.tac (268934 => 268935)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/buildbot.tac 2020-10-23 18:51:37 UTC (rev 268934)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/buildbot.tac 2020-10-23 18:54:26 UTC (rev 268935)
@@ -12,7 +12,7 @@
configfile = r'master.cfg'
rotateLength = 50000000
maxRotatedFiles = 20
-umask = 022
+umask = 0o022
if basedir == '.':
basedir = os.path.abspath(os.path.dirname(__file__))
Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/htdigestparser_unittest.py (268934 => 268935)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/htdigestparser_unittest.py 2020-10-23 18:51:37 UTC (rev 268934)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/htdigestparser_unittest.py 2020-10-23 18:54:26 UTC (rev 268935)
@@ -1,4 +1,4 @@
-# Copyright (C) 2011 Apple Inc. All rights reserved.
+# Copyright (C) 2011-2020 Apple Inc. All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
@@ -20,10 +20,15 @@
# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-import StringIO
+import sys
import os
import unittest
+if sys.version_info > (3, 0):
+ from io import StringIO
+else:
+ from StringIO import StringIO
+
from htdigestparser import HTDigestParser
@@ -60,7 +65,7 @@
self.assertEntriesEqual(entries, additional_content='')
def test_empty_file(self):
- self.assertEqual([], HTDigestParser(StringIO.StringIO()).entries())
+ self.assertEqual([], HTDigestParser(StringIO()).entries())
def test_too_few_colons(self):
self.assertEntriesEqual([], additional_content='user1:realm 1\n')
@@ -75,7 +80,7 @@
self.assertEntriesEqual([], additional_content='user1:realm 1: 36b8aa27fa5e9051095d37b619f92762\n')
def fake_htdigest_file(self):
- return StringIO.StringIO("""user1:realm 1:36b8aa27fa5e9051095d37b619f92762
+ return StringIO("""user1:realm 1:36b8aa27fa5e9051095d37b619f92762
user2:realm 2:14f827686fa97778f02fe1314a3337c8
user3:realm 1:1817fc8a24119cc57fbafc8a630ea5a5
user3:realm 3:a05f5a2335e9d87bbe75bbe5e53248f0
Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/loadConfig.py (268934 => 268935)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/loadConfig.py 2020-10-23 18:51:37 UTC (rev 268934)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/loadConfig.py 2020-10-23 18:54:26 UTC (rev 268935)
@@ -180,7 +180,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/BuildSlaveSupport/build.webkit.org-config/loadConfig_unittest.py (268934 => 268935)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/loadConfig_unittest.py 2020-10-23 18:51:37 UTC (rev 268934)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/loadConfig_unittest.py 2020-10-23 18:54:26 UTC (rev 268935)
@@ -87,7 +87,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 (268934 => 268935)
--- trunk/Tools/ChangeLog 2020-10-23 18:51:37 UTC (rev 268934)
+++ trunk/Tools/ChangeLog 2020-10-23 18:54:26 UTC (rev 268935)
@@ -1,5 +1,17 @@
2020-10-23 Aakash Jain <aakash_j...@apple.com>
+ [build.webkit.org] Add python 3 support - part 2
+ https://bugs.webkit.org/show_bug.cgi?id=218130
+
+ Reviewed by Jonathan Bedard.
+
+ * BuildSlaveSupport/build.webkit.org-config/buildbot.tac:
+ * BuildSlaveSupport/build.webkit.org-config/htdigestparser_unittest.py:
+ * BuildSlaveSupport/build.webkit.org-config/loadConfig.py:
+ * BuildSlaveSupport/build.webkit.org-config/loadConfig_unittest.py:
+
+2020-10-23 Aakash Jain <aakash_j...@apple.com>
+
[build.webkit.org] Create master.cfg for newer buildbot
https://bugs.webkit.org/show_bug.cgi?id=218102
