changed unit test script to use SIGTERM instead of SIGKILL
This commit is contained in:
parent
e5f3678703
commit
04887c2180
@ -2326,12 +2326,12 @@ class VideoStreaming(Doc_Print_Test_Case):
|
|||||||
server = None
|
server = None
|
||||||
output_file_name = None
|
output_file_name = None
|
||||||
|
|
||||||
from signal import SIGKILL
|
from signal import SIGTERM
|
||||||
def killserver(server):
|
def killserver(server):
|
||||||
pid = server.pid
|
pid = server.pid
|
||||||
try:
|
try:
|
||||||
pgid = os.getpgid(pid)
|
pgid = os.getpgid(pid)
|
||||||
os.killpg(pgid, SIGKILL)
|
os.killpg(pgid, SIGTERM)
|
||||||
except OSError:
|
except OSError:
|
||||||
# process might already be dead, os.getpgid throw in this case
|
# process might already be dead, os.getpgid throw in this case
|
||||||
pass
|
pass
|
||||||
@ -2342,7 +2342,7 @@ def killserver(server):
|
|||||||
def make_clean_up_testing(server):
|
def make_clean_up_testing(server):
|
||||||
def clean_up_testing():
|
def clean_up_testing():
|
||||||
try:
|
try:
|
||||||
killserver(server) # SIGKILL
|
killserver(server) # SIGTERM
|
||||||
except:
|
except:
|
||||||
pass
|
pass
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user