Changeset 252738 in webkit


Ignore:
Timestamp:
Nov 21, 2019 9:08:21 AM (4 years ago)
Author:
Jonathan Bedard
Message:

run-webkit-tests: Clean-up simulator processes after tearing down simulators
https://bugs.webkit.org/show_bug.cgi?id=204416

Reviewed by Simon Fraser.

  • Scripts/webkitpy/common/system/executive_mock.py:

(MockExecutive.running_pids): Make function Python 3 compatible.

  • Scripts/webkitpy/xcode/simulated_device.py:

(SimulatedDeviceManager.tear_down): Kill any CoreSimulator processes.

Location:
trunk/Tools
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/Tools/ChangeLog

    r252734 r252738  
     12019-11-21  Jonathan Bedard  <jbedard@apple.com>
     2
     3        run-webkit-tests: Clean-up simulator processes after tearing down simulators
     4        https://bugs.webkit.org/show_bug.cgi?id=204416
     5
     6        Reviewed by Simon Fraser.
     7
     8        * Scripts/webkitpy/common/system/executive_mock.py:
     9        (MockExecutive.running_pids): Make function Python 3 compatible.
     10        * Scripts/webkitpy/xcode/simulated_device.py:
     11        (SimulatedDeviceManager.tear_down): Kill any CoreSimulator processes.
     12
    1132019-11-21  Pablo Saavedra  <psaavedra@igalia.com>
    214
  • trunk/Tools/Scripts/webkitpy/common/system/executive_mock.py

    r251808 r252738  
    8989    def running_pids(self, process_name_filter):
    9090        running_pids = []
    91         for process_name, process_pid in self._running_pids.iteritems():
     91        for process_name, process_pid in self._running_pids.items():
    9292            if process_name_filter(process_name):
    9393                running_pids.append(process_pid)
  • trunk/Tools/Scripts/webkitpy/xcode/simulated_device.py

    r252727 r252738  
    490490        SimulatedDeviceManager.INITIALIZED_DEVICES = None
    491491
     492        if SimulatedDeviceManager._managing_simulator_app:
     493            for pid in host.executive.running_pids(lambda name: 'CoreSimulator.framework' in name):
     494                host.executive.kill_process(pid)
     495
    492496        # If we were managing the simulator, there are some cache files we need to remove
    493497        for directory in host.filesystem.glob('/tmp/com.apple.CoreSimulator.SimDevice.*'):
Note: See TracChangeset for help on using the changeset viewer.