Title: [252727] trunk/Tools
Revision
252727
Author
[email protected]
Date
2019-11-20 21:12:56 -0800 (Wed, 20 Nov 2019)

Log Message

run-webkit-tests: Make usability test on booting simulators more robust
https://bugs.webkit.org/show_bug.cgi?id=204423
<rdar://problem/57364735>

Reviewed by Alexey Proskuryakov.

* Scripts/webkitpy/xcode/simulated_device.py:
(SimulatedDevice.is_usable): Use regular expressions to find home-screen service.

Modified Paths

Diff

Modified: trunk/Tools/ChangeLog (252726 => 252727)


--- trunk/Tools/ChangeLog	2019-11-21 04:34:19 UTC (rev 252726)
+++ trunk/Tools/ChangeLog	2019-11-21 05:12:56 UTC (rev 252727)
@@ -1,5 +1,16 @@
 2019-11-20  Jonathan Bedard  <[email protected]>
 
+        run-webkit-tests: Make usability test on booting simulators more robust
+        https://bugs.webkit.org/show_bug.cgi?id=204423
+        <rdar://problem/57364735>
+
+        Reviewed by Alexey Proskuryakov.
+
+        * Scripts/webkitpy/xcode/simulated_device.py:
+        (SimulatedDevice.is_usable): Use regular expressions to find home-screen service.
+
+2019-11-20  Jonathan Bedard  <[email protected]>
+
         run-webkit-tests: Do not create global SystemHost objects
         https://bugs.webkit.org/show_bug.cgi?id=204426
 

Modified: trunk/Tools/Scripts/webkitpy/xcode/simulated_device.py (252726 => 252727)


--- trunk/Tools/Scripts/webkitpy/xcode/simulated_device.py	2019-11-21 04:34:19 UTC (rev 252726)
+++ trunk/Tools/Scripts/webkitpy/xcode/simulated_device.py	2019-11-21 05:12:56 UTC (rev 252727)
@@ -559,9 +559,9 @@
             _log.debug(u'{} has no service to check if the device is usable'.format(self.device_type.software_variant))
             return True
 
-        for line in self.executive.run_command([SimulatedDeviceManager.xcrun, 'simctl', 'spawn', self.udid, 'launchctl', 'print', 'system'], decode_output=False).splitlines():
-            if home_screen_service in line:
-                return True
+        system_processes = self.executive.run_command([SimulatedDeviceManager.xcrun, 'simctl', 'spawn', self.udid, 'launchctl', 'print', 'system'], decode_output=False)
+        if re.search(r'"{}"'.format(home_screen_service), system_processes) or re.search(r'A\s+{}'.format(home_screen_service), system_processes):
+            return True
         return False
 
     def _shut_down(self, timeout=30.0):
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to