Python test webkitpy.common.system.executive_unittest.ExecutiveTest.serial_test_kill_...
authorap@apple.com <ap@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 13 Apr 2016 03:57:36 +0000 (03:57 +0000)
committerap@apple.com <ap@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 13 Apr 2016 03:57:36 +0000 (03:57 +0000)
https://bugs.webkit.org/show_bug.cgi?id=155367

Reviewed by Darin Adler.

* Scripts/webkitpy/common/system/executive.py: (Executive.kill_process):
Don't flakily consume the return code with waitpid, callers need to do waitpid on
their own. Not sure if this line of code was even intentional.

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

Tools/ChangeLog
Tools/Scripts/webkitpy/common/system/executive.py

index dfcc4cb..831c38a 100644 (file)
@@ -1,3 +1,14 @@
+2016-04-12  Alexey Proskuryakov  <ap@apple.com>
+
+        Python test webkitpy.common.system.executive_unittest.ExecutiveTest.serial_test_kill_process is flaky
+        https://bugs.webkit.org/show_bug.cgi?id=155367
+
+        Reviewed by Darin Adler.
+
+        * Scripts/webkitpy/common/system/executive.py: (Executive.kill_process):
+        Don't flakily consume the return code with waitpid, callers need to do waitpid on
+        their own. Not sure if this line of code was even intentional.
+
 2016-04-12  Myles C. Maxfield  <mmaxfield@apple.com>
 
         [OS X] Flakey crash after ScrollAnimatorMac destruction
index 19a3793..a23c252 100644 (file)
@@ -205,7 +205,6 @@ class Executive(object):
                 # already exited, and forcefully kill it if SIGTERM wasn't enough.
                 os.kill(pid, signal.SIGTERM)
                 os.kill(pid, signal.SIGKILL)
-                _ = os.waitpid(pid, os.WNOHANG)
             except OSError, e:
                 if e.errno == errno.EAGAIN:
                     if retries_left <= 0: