File tree Expand file tree Collapse file tree 1 file changed +8
-6
lines changed Expand file tree Collapse file tree 1 file changed +8
-6
lines changed Original file line number Diff line number Diff line change 11#!/usr/bin/env python
22
3- import sys
43import os
4+ from os .path import join as pjoin
55import pathlib
6- sys .path .insert (0 , os .path .join (os .path .dirname (__file__ ), '..' ))
6+ import sys
7+ sys .path .insert (0 , pjoin (os .path .dirname (__file__ ), '..' ))
78
9+ import signal
10+ import socket
811import subprocess
9- from os .path import join as pjoin
1012import time
11- import socket
1213from baselayer .tools .supervisor_status import supervisor_status
1314try :
1415 import http .client as http
@@ -73,7 +74,8 @@ def delete_test_yaml():
7374
7475 clear_tables ()
7576
76- web_client = subprocess .Popen (['make' , 'testrun' ], cwd = base_dir )
77+ web_client = subprocess .Popen (['make' , 'testrun' ], cwd = base_dir ,
78+ preexec_fn = os .setsid )
7779
7880 print ('[test_frontend] Waiting for supervisord to launch all server processes...' )
7981
@@ -116,5 +118,5 @@ def delete_test_yaml():
116118 raise
117119 finally :
118120 print ('[test_frontend] Terminating supervisord...' )
119- web_client . terminate ( )
121+ os . killpg ( os . getpgid ( web_client . pid ), signal . SIGTERM )
120122 delete_test_yaml ()
You can’t perform that action at this time.
0 commit comments