Changeset 268496 in webkit

Timestamp:

Oct 14, 2020 4:08:15 PM (4 years ago)

Author:

aakash_jain@apple.com

Message:

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

Reviewed by Jonathan Bedard.

• BuildSlaveSupport/build.webkit.org-config/steps.py:

(UploadBuiltProduct.init): Changed 0644 to 0o644.
(UploadTestResults.init): Ditto.

• BuildSlaveSupport/build.webkit.org-config/steps_unittest.py: Removed unused imports.
• BuildSlaveSupport/build.webkit.org-config/run-buildbot-test.py: Used .format() instead of % string formatting.

Location:

trunk/Tools

Files:

• BuildSlaveSupport/build.webkit.org-config/run-buildbot-test.py (modified) (13 diffs)
• BuildSlaveSupport/build.webkit.org-config/steps.py (modified) (2 diffs)
• BuildSlaveSupport/build.webkit.org-config/steps_unittest.py (modified) (1 diff)
• ChangeLog (modified) (1 diff)

trunk/Tools/BuildSlaveSupport/build.webkit.org-config/run-buildbot-test.py

@@ -63 +63 @@
 buildmaster_host = 'localhost'
 port = 17000
-slavename = '%(worker)s'
+slavename = '{}'
 passwd = '1234'
 keepalive = 600
@@ -96 +96 @@
     if tmpdir is not None:
         if not os.path.isdir(tmpdir):
-            raise ValueError('%s is not a directory' % tmpdir)
+            raise ValueError('{} is not a directory'.format(tmpdir))
         return tempfile.mkdtemp(prefix=os.path.join(os.path.abspath(tmpdir), 'tmp'))
     return tempfile.mkdtemp()
@@ -105 +105 @@
         if type(cmd) == type([]):
             cmd = ' '.join(cmd)
-        print('WARNING: "%s" returned %s status code' % (cmd, retcode))
+        print('WARNING: "{cmd}" returned {retcode} status code'.format(cmd=cmd, retcode=retcode))
         if stdout is not None:
             print(stdout)
@@ -116 +116 @@
 def setup_master_workdir(configdir, base_workdir):
     master_workdir = os.path.join(base_workdir, 'master')
-    print('Copying files from %s to %s ...' % (configdir, master_workdir))
+    print('Copying files from {} to {} ...'.format(configdir, master_workdir))
     shutil.copytree(configdir, master_workdir)
-    print('Generating buildbot files at %s ...' % master_workdir)
+    print('Generating buildbot files at {} ...'.format(master_workdir))
     with open(os.path.join(master_workdir, 'buildbot.tac'), 'w') as f:
         f.write(test_buildbot_master_tac)
@@ -159 +159 @@
             if check_tcp_port_open('localhost', 8710):
                 print('Test buildmaster ready!.\n\n'
-                     + ' - See buildmaster log:\n'
-                     + '     tail -f %s\n' % buildmasterlog
-                     + ' - Open a browser to:\n'
-                     + '     http://localhost:8710\n'
-                     + ' - Credentials for triggering manual builds:\n'
-                     + '     login:     committer@webkit.org\n'
-                     + '     password:  committerpassword\n')
+                      + ' - See buildmaster log:\n'
+                      + '     tail -f {}\n'.format(buildmasterlog)
+                      + ' - Open a browser to:\n'
+                      + '     http://localhost:8710\n'
+                      + ' - Credentials for triggering manual builds:\n'
+                      + '     login:     committer@webkit.org\n'
+                      + '     password:  committerpassword\n')
                 with open(os.path.join(master_workdir, '.master-is-ready'), 'w') as f:
                     f.write('ready')
@@ -183 +183 @@
         else:
             print_if_error_stdout_stderr(twistd_cmd, twistd_process.returncode, stdout, stderr,
-                                         'Check the log at %s' % buildmasterlog)
+                                         'Check the log at {}'.format(buildmasterlog))
     return 0
 
@@ -192 +192 @@
         passwords = json.load(f)
     list_workers = []
-    for worker in passwords.keys():
+    for worker in passwords:
         list_workers.append(str(worker))
     return list_workers
@@ -204 +204 @@
     os.mkdir(worker_workdir)
     with open(os.path.join(worker_workdir, 'buildbot.tac'), 'w') as f:
-        f.write(worker_buildbot_master_tac % {'worker': worker})
+        f.write(worker_buildbot_master_tac.format(worker))
     twistd_cmd = ['twistd', '-l', 'worker.log', '-noy', 'buildbot.tac']
     twistd_worker_process = subprocess.Popen(twistd_cmd, cwd=worker_workdir,
@@ -214 +214 @@
         return
     print_if_error_stdout_stderr(twistd_cmd, twistd_worker_process.returncode, stdout, stderr,
-                                 'Check the log at %s' % os.path.join(worker_workdir, 'worker.log'))
+                                 'Check the log at {}'.format(os.path.join(worker_workdir, 'worker.log')))
 
 
 def clean(temp_dir):
     if os.path.isdir(temp_dir):
-        print('\n\nCleaning %s ... \n' % (temp_dir))
+        print('\n\nCleaning {} ... \n'.format(temp_dir))
         # shutil.rmtree can fail if we hold an open file descriptor on temp_dir
         # (which is very likely when cleaning) or if temp_dir is a NFS mount.
@@ -240 +240 @@
 def setup_virtualenv(base_workdir_temp):
     if cmd_exists('virtualenv'):
-        print('Setting up virtualenv at %s ... ' % base_workdir_temp)
+        print('Setting up virtualenv at {} ... '.format(base_workdir_temp))
         virtualenv_cmd = ['virtualenv', '-p', 'python2', 'venv']
         virtualenv_process = subprocess.Popen(virtualenv_cmd, cwd=base_workdir_temp,
@@ -282 +282 @@
     configdir = os.path.abspath(os.path.realpath(configdir))
     if not configdir_is_valid(configdir):
-        raise ValueError('The configdir %s dont contains the buildmaster files expected by this script' % configdir)
+        raise ValueError('The configdir {} dont contains the buildmaster files expected by this script'.format(configdir))
     base_workdir_temp = os.path.abspath(os.path.realpath(create_tempdir(basetempdir)))
     if base_workdir_temp.startswith(configdir):
-        raise ValueError('The temporal working directory %s cant be located inside configdir %s' % (base_workdir_temp, configdir))
+        raise ValueError('The temporal working directory {} cant be located inside configdir {}'.format(base_workdir_temp, configdir))
     try:
         if not use_system_version:
@@ -296 +296 @@
         if no_workers:
             print(' - To manually attach a build worker use this info:\n'
-                 + '     TCP port for the worker-to-master connection: 17000\n'
-                 + '     worker-id: the one defined at %s\n' % os.path.join(master_workdir, 'passwords.json')
-                 + '     password:  1234\n')
+                  + '     TCP port for the worker-to-master connection: 17000\n'
+                  + '     worker-id: the one defined at {}\n'.format(os.path.join(master_workdir, 'passwords.json'))
+                  + '     password:  1234\n')
         else:
             worker_runners = []
@@ -306 +306 @@
                 worker_runners.append(worker_runner)
             print(' - Workers started!.\n'
-                 + '     Check the log for each one at %s/${worker-name-id}/worker.log\n' % base_workdir_temp
-                 + '     tail -f %s/*/worker.log\n' % base_workdir_temp)
+                  + '     Check the log for each one at {}/${worker-name-id}/worker.log\n'.format(base_workdir_temp)
+                  + '     tail -f {}/*/worker.log\n'.format(base_workdir_temp))
             for worker_runner in worker_runners:
                 worker_runner.join()

trunk/Tools/BuildSlaveSupport/build.webkit.org-config/steps.py

@@ -340 +340 @@
         kwargs['slavesrc'] = self.slavesrc
         kwargs['masterdest'] = self.masterdest
-        kwargs['mode'] = 0644
+        kwargs['mode'] = 0o644
         kwargs['blocksize'] = 1024 * 256
         transfer.FileUpload.__init__(self, **kwargs)
@@ -1031 +1031 @@
         kwargs['slavesrc'] = self.slavesrc
         kwargs['masterdest'] = self.masterdest
-        kwargs['mode'] = 0644
+        kwargs['mode'] = 0o644
         kwargs['blocksize'] = 1024 * 256
         transfer.FileUpload.__init__(self, **kwargs)

trunk/Tools/BuildSlaveSupport/build.webkit.org-config/steps_unittest.py

@@ -3 +3 @@
 import sys
 import os
-import StringIO
 import unittest
-import make_passwords_json
 import json
 

trunk/Tools/ChangeLog

@@ +1 @@
+2020-10-14  Aakash Jain  <aakash_jain@apple.com>
+
+        [build.webkit.org] Add python 3 support - part 1
+        https://bugs.webkit.org/show_bug.cgi?id=217727
+
+        Reviewed by Jonathan Bedard.
+
+        * BuildSlaveSupport/build.webkit.org-config/steps.py:
+        (UploadBuiltProduct.__init__): Changed 0644 to 0o644.
+        (UploadTestResults.__init__): Ditto.
+        * BuildSlaveSupport/build.webkit.org-config/steps_unittest.py: Removed unused imports.
+        * BuildSlaveSupport/build.webkit.org-config/run-buildbot-test.py: Used .format() instead of % string formatting.
+
 2020-10-14  Sam Weinig  <weinig@apple.com>