Title: [219534] trunk/Tools
- Revision
- 219534
- Author
- jbed...@apple.com
- Date
- 2017-07-14 17:29:52 -0700 (Fri, 14 Jul 2017)
Log Message
Failing to install on iPad simulators
https://bugs.webkit.org/show_bug.cgi?id=174532
<rdar://problem/33328347>
Reviewed by Stephanie Lewis.
* Scripts/webkitpy/xcode/simulated_device.py:
(SimulatedDevice.install_app): Place install command in retry try-except block.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (219533 => 219534)
--- trunk/Tools/ChangeLog 2017-07-14 23:13:33 UTC (rev 219533)
+++ trunk/Tools/ChangeLog 2017-07-15 00:29:52 UTC (rev 219534)
@@ -1,3 +1,14 @@
+2017-07-14 Jonathan Bedard <jbed...@apple.com>
+
+ Failing to install on iPad simulators
+ https://bugs.webkit.org/show_bug.cgi?id=174532
+ <rdar://problem/33328347>
+
+ Reviewed by Stephanie Lewis.
+
+ * Scripts/webkitpy/xcode/simulated_device.py:
+ (SimulatedDevice.install_app): Place install command in retry try-except block.
+
2017-07-14 Jeff Miller <je...@apple.com>
Add test for -[WKProcessPool _setObjectsForBundleParametersWithDictionary:].
Modified: trunk/Tools/Scripts/webkitpy/xcode/simulated_device.py (219533 => 219534)
--- trunk/Tools/Scripts/webkitpy/xcode/simulated_device.py 2017-07-14 23:13:33 UTC (rev 219533)
+++ trunk/Tools/Scripts/webkitpy/xcode/simulated_device.py 2017-07-15 00:29:52 UTC (rev 219534)
@@ -25,6 +25,7 @@
import signal
import subprocess
+from webkitpy.common.system.executive import ScriptError
from webkitpy.xcode.simulator import Simulator
from webkitpy.common.host import Host
@@ -141,9 +142,8 @@
def install_app(self, app_path, env=None):
# FIXME: This is a workaround for <rdar://problem/30273973>, Racey failure of simctl install.
for x in xrange(3):
- if self._host.executive.run_command(['xcrun', 'simctl', 'install', self.udid, app_path], return_exit_code=True):
- return False
try:
+ self._host.executive.run_command(['xcrun', 'simctl', 'install', self.udid, app_path])
bundle_id = self._host.executive.run_command([
'/usr/libexec/PlistBuddy',
'-c',
@@ -152,7 +152,7 @@
]).rstrip()
self._host.executive.kill_process(self.launch_app(bundle_id, [], env=env, timeout=10))
return True
- except RuntimeError:
+ except (RuntimeError, ScriptError):
pass
return False
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
