⚠ Archived content — this site is no longer maintained.   Current WebKit documentation is at docs.webkit.org.

Changeset 281673 in webkit


Ignore:
Timestamp:
Aug 26, 2021, 4:24:19 PM (5 years ago)
Author:
Jonathan Bedard
Message:

[kill-old-processes] Invoke with Python 3
​https://bugs.webkit.org/show_bug.cgi?id=229576
<rdar://problem/82397885>

Rubber-stamped by Darin Adler.

  • CISupport/build-webkit-org/steps.py:

(KillOldProcesses): Invoke with Python 3.

  • CISupport/build-webkit-org/steps_unittest.py:

(TestKillOldProcesses.test_success):
(TestKillOldProcesses.test_failure):

  • CISupport/ews-build/steps.py:

(KillOldProcesses): Invoke with Python 3.

  • CISupport/ews-build/steps_unittest.py:
  • CISupport/kill-old-processes: Change shebang to Python 3.
Location:
trunk/Tools
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/Tools/CISupport/build-webkit-org/steps.py

    r281627 r281673  
    172172    description = ["killing old processes"]
    173173    descriptionDone = ["killed old processes"]
    174     command = ["python", "./Tools/CISupport/kill-old-processes", "buildbot"]
     174    command = ["python3", "./Tools/CISupport/kill-old-processes", "buildbot"]
    175175
    176176

  • trunk/Tools/CISupport/build-webkit-org/steps_unittest.py

    r281627 r281673  
    238238                timeout=1200,
    239239                logEnviron=True,
    240                 command=['python', './Tools/CISupport/kill-old-processes', 'buildbot'],
     240                command=['python3', './Tools/CISupport/kill-old-processes', 'buildbot'],
    241241            ) + 0,
    242242        )
    … …  
    251251                timeout=1200,
    252252                logEnviron=True,
    253                 command=['python', './Tools/CISupport/kill-old-processes', 'buildbot'],
     253                command=['python3', './Tools/CISupport/kill-old-processes', 'buildbot'],
    254254            ) + 2
    255255            + ExpectShell.log('stdio', stdout='Unexpected error.'),

  • trunk/Tools/CISupport/ews-build/steps.py

    r281660 r281673  
    20902090    description = ['killing old processes']
    20912091    descriptionDone = ['Killed old processes']
    2092     command = ['python', 'Tools/CISupport/kill-old-processes', 'buildbot']
     2092    command = ['python3', 'Tools/CISupport/kill-old-processes', 'buildbot']
    20932093
    20942094    def __init__(self, **kwargs):

  • trunk/Tools/CISupport/ews-build/steps_unittest.py

    r281586 r281673  
    817817        self.expectRemoteCommands(
    818818            ExpectShell(workdir='wkdir',
    819                         command=['python', 'Tools/CISupport/kill-old-processes', 'buildbot'],
     819                        command=['python3', 'Tools/CISupport/kill-old-processes', 'buildbot'],
    820820                        logEnviron=False,
    821821                        timeout=120,
    … …  
    830830        self.expectRemoteCommands(
    831831            ExpectShell(workdir='wkdir',
    832                         command=['python', 'Tools/CISupport/kill-old-processes', 'buildbot'],
     832                        command=['python3', 'Tools/CISupport/kill-old-processes', 'buildbot'],
    833833                        logEnviron=False,
    834834                        timeout=120,

  • trunk/Tools/CISupport/kill-old-processes

    r281627 r281673  
    1 #!/usr/bin/env python
     1#!/usr/bin/env python3
    22# Copyright (C) 2010 Apple Inc.  All rights reserved.
    33# Copyright (C) 2011 Google Inc.  All rights reserved.
    … …  
    5252    ret = []
    5353    output = subprocess.check_output(["ipcs", "-m"])
     54    if type(output) == bytes:
     55        output = output.decode('utf-8', errors='strict')
    5456    lines = output.split('\n')
    5557    if len(lines) < 3:

  • trunk/Tools/ChangeLog

    r281664 r281673  
     12021-08-26  Jonathan Bedard  <jbedard@apple.com>
     2
     3        [kill-old-processes] Invoke with Python 3
     4        https://bugs.webkit.org/show_bug.cgi?id=229576
     5        <rdar://problem/82397885>
     6
     7        Rubber-stamped by Darin Adler.
     8
     9        * CISupport/build-webkit-org/steps.py:
     10        (KillOldProcesses): Invoke with Python 3.
     11        * CISupport/build-webkit-org/steps_unittest.py:
     12        (TestKillOldProcesses.test_success):
     13        (TestKillOldProcesses.test_failure):
     14        * CISupport/ews-build/steps.py:
     15        (KillOldProcesses): Invoke with Python 3.
     16        * CISupport/ews-build/steps_unittest.py:
     17        * CISupport/kill-old-processes: Change shebang to Python 3.
     18
    1192021-08-26  Ryan Haddad  <ryanhaddad@apple.com>
    220
Note: See TracChangeset for help on using the changeset viewer.