webkitpy: Increase simulator teardown timeout
authorjbedard@apple.com <jbedard@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 4 Jan 2019 17:58:08 +0000 (17:58 +0000)
committerjbedard@apple.com <jbedard@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 4 Jan 2019 17:58:08 +0000 (17:58 +0000)
https://bugs.webkit.org/show_bug.cgi?id=193141
<rdar://problem/46174217>

Rubber-stamped by Aakash Jain.

* Scripts/webkitpy/xcode/simulated_device.py:
(SimulatedDeviceManager.tear_down): Use SIMULATOR_BOOT_TIMEOUT.

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

Tools/ChangeLog
Tools/Scripts/webkitpy/xcode/simulated_device.py

index 48d642a..d420b23 100644 (file)
@@ -1,3 +1,14 @@
+2019-01-04  Jonathan Bedard  <jbedard@apple.com>
+
+        webkitpy: Increase simulator teardown timeout
+        https://bugs.webkit.org/show_bug.cgi?id=193141
+        <rdar://problem/46174217>
+
+        Rubber-stamped by Aakash Jain.
+
+        * Scripts/webkitpy/xcode/simulated_device.py:
+        (SimulatedDeviceManager.tear_down): Use SIMULATOR_BOOT_TIMEOUT.
+
 2019-01-03  Ross Kirsling  <ross.kirsling@sony.com>
 
         test262-runner misbehaves when test file YAML has a trailing space
index 9510a4b..fc924dd 100644 (file)
@@ -442,7 +442,7 @@ class SimulatedDeviceManager(object):
         SimulatedDeviceManager._wait_until_device_is_usable(device, max(0, deadline - time.time()))
 
     @staticmethod
-    def tear_down(host=SystemHost(), timeout=60):
+    def tear_down(host=SystemHost(), timeout=SIMULATOR_BOOT_TIMEOUT):
         if SimulatedDeviceManager._managing_simulator_app:
             host.executive.run_command(['killall', '-9', 'Simulator'], return_exit_code=True)
             SimulatedDeviceManager._managing_simulator_app = False