error running layout tests on iOS simulator on latest build

https://bugs.webkit.org/show_bug.cgi?id=152719
<rdar://problem/24009549>

Reviewed by Alexey Proskuryakov.

* Scripts/webkitpy/xcode/simulator.py:
(Simulator.wait_until_device_is_booted): Ensure that simulator device is in booted state
  before running simctl spawn command.

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

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 3965d5da620dff26e51ffdbc6109638c47b75ce1..9a575971903e5dade08859dba619ed1957a8d88a 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,15 @@
+2016-01-04  Aakash Jain  <aakash_jain@apple.com>
+
+        error running layout tests on iOS simulator on latest build
+        https://bugs.webkit.org/show_bug.cgi?id=152719
+        <rdar://problem/24009549>
+
+        Reviewed by Alexey Proskuryakov.
+
+        * Scripts/webkitpy/xcode/simulator.py:
+        (Simulator.wait_until_device_is_booted): Ensure that simulator device is in booted state
+          before running simctl spawn command.
+
 2016-01-03  Michael Catanzaro  <mcatanzaro@igalia.com>
 
         Unreviewed, move Frédéric Wang to committers list

diff --git a/Tools/Scripts/webkitpy/xcode/simulator.py b/Tools/Scripts/webkitpy/xcode/simulator.py
index 4e1a9100c0893ec2c9c8f662a155a6816206fef2..3dc27eb71c3fa2846b9e995f005f3dd6f55f0d51 100644 (file)
--- a/Tools/Scripts/webkitpy/xcode/simulator.py
+++ b/Tools/Scripts/webkitpy/xcode/simulator.py
@@ -275,6 +275,7 @@ class Simulator(object):
 
     @staticmethod
     def wait_until_device_is_booted(udid, timeout_seconds=60 * 5):
+        Simulator.wait_until_device_is_in_state(udid, Simulator.DeviceState.BOOTED, timeout_seconds)
         with timeout(seconds=timeout_seconds):
             while True:
                 state = subprocess.check_output(['xcrun', 'simctl', 'spawn', udid, 'launchctl', 'print', 'system']).strip()