Changeset 252727 in webkit

Timestamp:

Nov 20, 2019, 9:12:56 PM (7 years ago)

Author:

Jonathan Bedard

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.

Location:

trunk/Tools

Files:

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

trunk/Tools/ChangeLog

@@ +1 @@
+2019-11-20  Jonathan Bedard  <jbedard@apple.com>
+
+        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  <jbedard@apple.com>
 

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

@@ -560 +560 @@
             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