fix test script leaks processes (#6700)

test/run_tests.py

@@ -57,8 +57,9 @@
 def signal_handler(sgnl, frame):
     os.killpg(os.getpgid(webcontrol.pid), signal.SIGKILL)
     os.killpg(os.getpgid(beakerx.pid), signal.SIGKILL)
-    os.system("kill -9 `pgrep -f jupyter`")
-    os.system("kill -9 `pgrep -f webdriver`")
+    test_console.kill_processes('jupyter')
+    test_console.kill_processes('webdriver')
+    test_console.kill_processes('java')
     sys.exit(20)
 signal.signal(signal.SIGINT, signal_handler)
 
@@ -68,6 +69,7 @@ def signal_handler(sgnl, frame):
 # Send the signal to all the process groups
 os.killpg(os.getpgid(beakerx.pid), signal.SIGKILL)
 os.killpg(os.getpgid(webcontrol.pid), signal.SIGKILL)
+test_console.kill_processes('java')
 
 if not result:
     result = test_console.test_lsmagic()

test/test_console.py

@@ -40,7 +40,7 @@ def stop_console(p, pexpect, t):
     p.expect([pexpect.EOF, pexpect.TIMEOUT], timeout=t)
     if p.isalive():
         p.terminate()
-    kill_jupyter()
+    kill_processes('jupyter')
 
 def test_lsmagic():
     result = 0
@@ -71,10 +71,10 @@ def test_lsmagic():
     print("test_lsmagic return code=", result)
     return result
 
-def kill_jupyter():
+def kill_processes(name):
     try:
-        pidlist = map(int, check_output(['pgrep', '-f', 'jupyter']).split())
+        pidlist = map(int, check_output(['pgrep', '-f', name]).split())
     except CalledProcessError:
         pidlist = []
     for pid in pidlist:
-        os.kill(pid, signal.SIGKILL)
+        os.kill(pid, signal.SIGKILL)