Continuous "Reentrancy avoided" error messages in run-webkit-tests if Simulator quits...
authoraakash_jain@apple.com <aakash_jain@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 14 Jun 2016 23:28:11 +0000 (23:28 +0000)
committeraakash_jain@apple.com <aakash_jain@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 14 Jun 2016 23:28:11 +0000 (23:28 +0000)
https://bugs.webkit.org/show_bug.cgi?id=158756

Reviewed by Alexey Proskuryakov.

* Scripts/webkitpy/xcode/simulator.py:
(Simulator.wait_until_device_is_booted): If checking Simulator boot state fails, verify if
the "simulator device" is still in booted state. Since we ensured that simulator device
was in booted state earlier in this method, this indicates that simulator device has shut down
unexpectedly.

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

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

index bb8d770..59c98f5 100644 (file)
@@ -1,3 +1,16 @@
+2016-06-14  Aakash Jain  <aakash_jain@apple.com>
+
+        Continuous "Reentrancy avoided" error messages in run-webkit-tests if Simulator quits unexpectedly
+        https://bugs.webkit.org/show_bug.cgi?id=158756
+
+        Reviewed by Alexey Proskuryakov.
+
+        * Scripts/webkitpy/xcode/simulator.py:
+        (Simulator.wait_until_device_is_booted): If checking Simulator boot state fails, verify if
+        the "simulator device" is still in booted state. Since we ensured that simulator device 
+        was in booted state earlier in this method, this indicates that simulator device has shut down
+        unexpectedly.
+
 2016-06-14  David Kilzer  <ddkilzer@apple.com>
 
         Follow-up fix #2: REGRESSION (r202020): El Capitan CMake Debug build broken
index 6151b52..b8401a4 100644 (file)
@@ -283,7 +283,9 @@ class Simulator(object):
                     if re.search("A[\s]+com.apple.springboard.services", state):
                         return
                 except subprocess.CalledProcessError:
-                    _log.warn("Error in checking Simulator boot status.")
+                    if Simulator.device_state(udid) != Simulator.DeviceState.BOOTED:
+                        raise RuntimeError('Simuator device quit unexpectedly.')
+                    _log.warn("Error in checking Simulator boot status. Will retry in 1 second.")
                 time.sleep(1)
 
     @staticmethod