Title: [282185] trunk/Tools
- Revision
- 282185
- Author
- jbed...@apple.com
- Date
- 2021-09-08 17:20:18 -0700 (Wed, 08 Sep 2021)
Log Message
Exception in run-webkit-tests: Bad file descriptor (Part 2)
https://bugs.webkit.org/show_bug.cgi?id=229994
<rdar://problem/82826083>
Reviewed by Ryan Haddad.
* Scripts/webkitpy/xcode/simulated_device.py:
(SimulatedDevice.launch_app): Catch OSError.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (282184 => 282185)
--- trunk/Tools/ChangeLog 2021-09-08 23:56:21 UTC (rev 282184)
+++ trunk/Tools/ChangeLog 2021-09-09 00:20:18 UTC (rev 282185)
@@ -1,3 +1,14 @@
+2021-09-08 Jonathan Bedard <jbed...@apple.com>
+
+ Exception in run-webkit-tests: Bad file descriptor (Part 2)
+ https://bugs.webkit.org/show_bug.cgi?id=229994
+ <rdar://problem/82826083>
+
+ Reviewed by Ryan Haddad.
+
+ * Scripts/webkitpy/xcode/simulated_device.py:
+ (SimulatedDevice.launch_app): Catch OSError.
+
2021-09-08 Sihui Liu <sihui_...@apple.com>
Regression (r282130): [ macOS iOS wk2 ] imported/w3c/web-platform-tests/storage/persisted.https.any.html is failing
Modified: trunk/Tools/Scripts/webkitpy/xcode/simulated_device.py (282184 => 282185)
--- trunk/Tools/Scripts/webkitpy/xcode/simulated_device.py 2021-09-08 23:56:21 UTC (rev 282184)
+++ trunk/Tools/Scripts/webkitpy/xcode/simulated_device.py 2021-09-09 00:20:18 UTC (rev 282185)
@@ -666,12 +666,17 @@
with Timeout(timeout, handler=RuntimeError(u'Timed out waiting for process to open {} on {}'.format(bundle_id, self.udid)), patch=False):
while True:
- output = self.executive.run_command(
- ['xcrun', 'simctl', 'launch', self.udid, bundle_id] + args,
- env=environment_to_use,
- error_handler=_log_debug_error,
- return_stderr=False,
- )
+ output = ''
+ try:
+ output = self.executive.run_command(
+ ['xcrun', 'simctl', 'launch', self.udid, bundle_id] + args,
+ env=environment_to_use,
+ error_handler=_log_debug_error,
+ return_stderr=False,
+ )
+ except OSError as e:
+ _log.debug("simctl launch raised '{}'".format(e))
+ continue
match = re.match(r'(?P<bundle>[^:]+): (?P<pid>\d+)\n', output)
# FIXME: We shouldn't need to check the PID <rdar://problem/31154075>.
if match and self.executive.check_running_pid(int(match.group('pid'))):
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
