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.


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@219534 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Author: [email protected]

Tools/ChangeLog

@@ -1,3 +1,14 @@
+2017-07-14  Jonathan Bedard  <[email protected]>
+
+        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  <[email protected]>
 
         Add test for -[WKProcessPool _setObjectsForBundleParametersWithDictionary:].

Tools/Scripts/webkitpy/xcode/simulated_device.py

@@ -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 reset(cls, udid):
     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 @@ def install_app(self, app_path, env=None):
                 ]).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