Changeset 290905 in webkit

Timestamp:

Mar 7, 2022, 1:16:48 PM (5 years ago)

Author:

Jonathan Bedard

Message:

[iOS] editing/async-clipboard/* 20 tests are flaky timeouts on iOS
​https://bugs.webkit.org/show_bug.cgi?id=237372
<rdar://problem/89689914>

Reviewed by Alexey Proskuryakov.

• Tools/CISupport/kill-old-processes: Kill "Simulator" process (since killing Simulator.app

won't do anything), shutdown simulators before killing processes. Check that simulators
are shut down before continuing.

Canonical link: ​https://commits.webkit.org/248136@main

Location:

trunk/Tools

Files:

• CISupport/kill-old-processes (modified) (4 diffs)
• ChangeLog (modified) (1 diff)

trunk/Tools/CISupport/kill-old-processes

@@ -25 +25 @@
 
 from __future__ import print_function
-import os, sys
+import json
+import os
 import getpass
 import re
 import subprocess
+import sys
+import time
+
 
 def listAllWebKitPrograms(builddir_bin):
@@ -76 +80 @@
             continue
     return ret
+
+def are_simulators_booted():
+    simctl_output = dict()
+    try:
+        simctl_output = json.loads(subprocess.check_output(
+            ['xcrun', 'simctl', 'list', '--json'],
+            **(dict(encoding='utf-8') if sys.version_info > (3, 0) else dict())
+        ))
+    except json.decoder.JSONDecodeError:
+        return False
+    for runtime, devices in simctl_output.get('devices', {}).items():
+        for device in devices:
+            state = device.get('state', '(unavailable)')
+            if state not in ('(unavailable)', 'Shutdown'):
+                print('{} is still {}'.format(device.get('udid', '?'), state))
+                return True
+    return False
 
 def main(user=None):
@@ -143 +164 @@
         "xcodebuild",
         # FIXME: Consider moving iOS-specific tasks to their own list.
-        "Simulator.app",
+        "Simulator",
     ]
 
@@ -166 +187 @@
     tasksToKill = os.getenv("WEBKITBOT_TASKSTOKILL", "").split()
     if sys.platform == 'darwin':
+        # Shutdown any simulators
+        if os.geteuid() == 0 and user:
+            os.system("sudo -u {} xcrun simctl shutdown all".format(user))
+        else:
+            os.system("xcrun simctl shutdown all")
+
+        # Ensure that simulators are shut down
+        start = time.time()
+        while are_simulators_booted() and start + 60 > time.time():
+            print('Waiting on simulators to shut down...')
+            time.sleep(10)
+
         os.system("ps aux")
         for task in tasksToKill + tasksToKillMac:
             os.system("killall -9 -v -m " + task)
-        # Shutdown any simulators
-        if os.geteuid() == 0 and user:
-            os.system("sudo -u {} xcrun simctl shutdown booted".format(user))
-        else:
-            os.system("xcrun simctl shutdown booted")
+
         # Kill all instances of python executing run-webkit-tests
         os.system("ps aux | grep -E '.+/Python3? .+(run_webkit_tests|run-webkit-tests|mod_pywebsocket)' | grep -v grep | awk '{print $2}' | xargs kill")

trunk/Tools/ChangeLog

@@ +1 @@
+2022-03-07  Jonathan Bedard  <jbedard@apple.com>
+
+        [iOS] editing/async-clipboard/* 20 tests are flaky timeouts on iOS
+        https://bugs.webkit.org/show_bug.cgi?id=237372
+        <rdar://problem/89689914>
+
+        Reviewed by Alexey Proskuryakov.
+
+        * CISupport/kill-old-processes: Kill "Simulator" process (since killing Simulator.app
+        won't do anything), shutdown simulators before killing processes. Check that simulators
+        are shut down before continuing.
+
 2022-03-07  Chris Dumez  <cdumez@apple.com>