Skip to content

Commit

Permalink
[run-webkit-tests] Surpress exception when terminating settings app
Browse files Browse the repository at this point in the history
https://bugs.webkit.org/show_bug.cgi?id=260860
rdar://114626133

Reviewed by Ryan Haddad.

* Tools/Scripts/webkitpy/xcode/simulated_device.py:
(SimulatedDevice.is_usable): Combine exit codes from starting and stopping Settings app.

Canonical link: https://commits.webkit.org/267428@main
  • Loading branch information
JonWBedard authored and robert-jenner committed Aug 29, 2023
1 parent fc1741d commit d6f0fed
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion Tools/Scripts/webkitpy/xcode/simulated_device.py
Original file line number Diff line number Diff line change
Expand Up @@ -595,7 +595,7 @@ def is_usable(self, force_update=False):
return True
exit_code = self.executive.run_command([SimulatedDeviceManager.xcrun, 'simctl', 'launch', self.udid, service], return_exit_code=True)
time.sleep(.7)
self.executive.run_command([SimulatedDeviceManager.xcrun, 'simctl', 'terminate', self.udid, service])
exit_code |= self.executive.run_command([SimulatedDeviceManager.xcrun, 'simctl', 'terminate', self.udid, service], return_exit_code=True)
if exit_code == 0:
return True
return False
Expand Down

0 comments on commit d6f0fed

Please sign in to comment.