Title: [244873] trunk/Tools
- Revision
- 244873
- Author
- [email protected]
- Date
- 2019-05-02 10:01:35 -0700 (Thu, 02 May 2019)
Log Message
webkitpy: Ignore errors when shutting down an already shutdown simulator
<https://bugs.webkit.org/show_bug.cgi?id=197514>
<rdar://problem/50390247>
Reviewed by Lucas Forschler.
* Scripts/webkitpy/xcode/simulated_device.py:
(SimulatedDevice._shut_down):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (244872 => 244873)
--- trunk/Tools/ChangeLog 2019-05-02 16:17:53 UTC (rev 244872)
+++ trunk/Tools/ChangeLog 2019-05-02 17:01:35 UTC (rev 244873)
@@ -1,3 +1,14 @@
+2019-05-02 Jonathan Bedard <[email protected]>
+
+ webkitpy: Ignore errors when shutting down an already shutdown simulator
+ <https://bugs.webkit.org/show_bug.cgi?id=197514>
+ <rdar://problem/50390247>
+
+ Reviewed by Lucas Forschler.
+
+ * Scripts/webkitpy/xcode/simulated_device.py:
+ (SimulatedDevice._shut_down):
+
2019-05-02 Frederic Wang <[email protected]>
[GTK][WPE] Disable "thin", "thick", "medium" values of mfrac@linethickness at runtime
Modified: trunk/Tools/Scripts/webkitpy/xcode/simulated_device.py (244872 => 244873)
--- trunk/Tools/Scripts/webkitpy/xcode/simulated_device.py 2019-05-02 16:17:53 UTC (rev 244872)
+++ trunk/Tools/Scripts/webkitpy/xcode/simulated_device.py 2019-05-02 17:01:35 UTC (rev 244873)
@@ -544,7 +544,7 @@
# Either shutdown is successful, or the device was already shutdown when we attempted to shut it down.
exit_code = self.executive.run_command([SimulatedDeviceManager.xcrun, 'simctl', 'shutdown', self.udid], return_exit_code=True)
- if exit_code != 0 and exit_code != 164:
+ if exit_code != 0 and self.state() != SimulatedDevice.DeviceState.SHUT_DOWN:
raise RuntimeError('Failed to shutdown {} with exit code {}'.format(self.udid, exit_code))
while self.state(force_update=True) != SimulatedDevice.DeviceState.SHUT_DOWN:
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
