Changeset 236579 in webkit

Timestamp:

Sep 27, 2018 5:50:28 PM (6 years ago)

Author:

Ryan Haddad

Message:

Increase the timeout for iOS Simulator data migration
​https://bugs.webkit.org/show_bug.cgi?id=190059

Reviewed by Aakash Jain.

3 minutes isn't always enough time for the data migrator to complete
when booting up multiple iOS Simulators. Change the timeout to 10 minutes.

• Scripts/webkitpy/xcode/simulated_device.py:

(SimulatedDeviceManager): Create a constant for the default timeout.
(SimulatedDeviceManager.initialize_devices): Use new constant.
(SimulatedDeviceManager.swap): Ditto.
(SimulatedDeviceManager.wait_until_data_migration_is_done): Ditto.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/xcode/simulated_device.py (modified) (4 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2018-09-27  Ryan Haddad  <ryanhaddad@apple.com>
+
+        Increase the timeout for iOS Simulator data migration
+        https://bugs.webkit.org/show_bug.cgi?id=190059
+
+        Reviewed by Aakash Jain.
+
+        3 minutes isn't always enough time for the data migrator to complete
+        when booting up multiple iOS Simulators. Change the timeout to 10 minutes.
+
+        * Scripts/webkitpy/xcode/simulated_device.py:
+        (SimulatedDeviceManager): Create a constant for the default timeout.
+        (SimulatedDeviceManager.initialize_devices): Use new constant.
+        (SimulatedDeviceManager.swap): Ditto.
+        (SimulatedDeviceManager.wait_until_data_migration_is_done): Ditto.
+
 2018-09-27  Alex Christensen  <achristensen@webkit.org>
 

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

@@ -62 +62 @@
     INITIALIZED_DEVICES = None
 
+    SIMULATOR_BOOT_TIMEOUT = 600
+
     # FIXME: Simulators should only take up 2GB, but because of <rdar://problem/39393590> something in the OS thinks they're taking closer to 6GB
     MEMORY_ESTIMATE_PER_SIMULATOR_INSTANCE = 6 * (1024 ** 3)  # 6GB a simulator.
@@ -315 +317 @@
 
     @staticmethod
-    def initialize_devices(requests, host=SystemHost(), name_base='Managed', simulator_ui=True, timeout=180, **kwargs):
+    def initialize_devices(requests, host=SystemHost(), name_base='Managed', simulator_ui=True, timeout=SIMULATOR_BOOT_TIMEOUT, **kwargs):
         if SimulatedDeviceManager.INITIALIZED_DEVICES is not None:
             return SimulatedDeviceManager.INITIALIZED_DEVICES
@@ -396 +398 @@
 
     @staticmethod
-    def swap(device, request, host=SystemHost(), name_base='Managed', timeout=180):
+    def swap(device, request, host=SystemHost(), name_base='Managed', timeout=SIMULATOR_BOOT_TIMEOUT):
         if SimulatedDeviceManager.INITIALIZED_DEVICES is None:
             raise RuntimeError('Cannot swap when there are no initialized devices')
@@ -420 +422 @@
 
     @staticmethod
-    def wait_until_data_migration_is_done(host, timeout=180):
+    def wait_until_data_migration_is_done(host, timeout=SIMULATOR_BOOT_TIMEOUT):
         # The existence of a datamigrator process means that simulators are still booting.
         deadline = time.time() + timeout