autoland: changeset 618467:f04b37fba56721889827889e30032c52de982cd7

author	Sam Sneddon <gsnedders@apple.com>
	Wed, 18 May 2022 03:33:15 +0000
changeset 618467	f04b37fba56721889827889e30032c52de982cd7
parent 618466	21a27b1169f196def6c8c4b06fc2fd9f810f7d7f
child 618468	d97834db35854a2ea5fb5137d28bdb4b22e8480b
push id	163295
push user	wptsync@mozilla.com
push date	Sun, 22 May 2022 08:42:45 +0000
treeherder	autoland@28d8297085fe [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
reviewers	testonly
bugs	1769587, 34076
milestone	102.0a1
first release with	nightly linux32 a24b55b4c524 / 102.0a1 / 20220523095244 / files nightly linux64 a24b55b4c524 / 102.0a1 / 20220523095244 / files nightly mac a24b55b4c524 / 102.0a1 / 20220523095244 / files nightly win32 a24b55b4c524 / 102.0a1 / 20220523095244 / files nightly win64 a24b55b4c524 / 102.0a1 / 20220523095244 / files
last release without	nightly linux32 f3d632ec453b / 102.0a1 / 20220521210526 / files nightly linux64 f3d632ec453b / 102.0a1 / 20220521210526 / files nightly mac f3d632ec453b / 102.0a1 / 20220521210526 / files nightly win32 f3d632ec453b / 102.0a1 / 20220521210526 / files nightly win64 f3d632ec453b / 102.0a1 / 20220521210526 / files

Bug 1769587 [wpt PR 34076] - [Safari] Sending SIGKILL isn't actually atomic with the actual kill, a=testonly Automatic update from web-platform-tests [Safari] Sending SIGKILL isn't actually atomic with the actual kill -- wpt-commits: 603799d27baf22b10b926752761c36b74ea3dc84 wpt-pr: 34076

testing/web-platform/tests/tools/wptrunner/wptrunner/browsers/safari.py

file | annotate | diff | comparison | revisions

--- a/testing/web-platform/tests/tools/wptrunner/wptrunner/browsers/safari.py
+++ b/testing/web-platform/tests/tools/wptrunner/wptrunner/browsers/safari.py
@@ -196,10 +196,11 @@ class SafariBrowser(WebDriverBrowser):
                     os.path.samefile(proc.info["exe"], self.safari_path)):
                     self.logger.debug("Stopping Safari %s" % proc.pid)
                     try:
                         proc.terminate()
                         try:
                             proc.wait(10)
                         except psutil.TimeoutExpired:
                             proc.kill()
+                            proc.wait(10)
                     except psutil.NoSuchProcess:
                         pass