Finished Behat threads are not killed
authorFrederic Massart <fred@moodle.com>
Wed, 9 Apr 2014 09:57:36 +0000 (17:57 +0800)
committerFrederic Massart <fred@moodle.com>
Wed, 9 Apr 2014 09:57:36 +0000 (17:57 +0800)
lib/commands/behat.py

index 4b6f9c9..99c8be8 100644 (file)
@@ -261,9 +261,9 @@ class BehatCommand(Command):
                     pass
 
                 # Kill the remaining processes
-                if phpServer:
+                if phpServer and phpServer.is_alive():
                     phpServer.kill()
-                if seleniumServer:
+                if seleniumServer and seleniumServer.is_alive():
                     seleniumServer.kill()
 
                 # Disable Behat