Skip to content

Commit f6599e9

Browse files
GnorTechrogerwang
authored andcommitted
[test] win32: terminate node http server by killing all subprocesses
The SIGTERM handler in node.py doesn't work on windows
1 parent dddc3e1 commit f6599e9

File tree

3 files changed

+15
-3
lines changed

3 files changed

+15
-3
lines changed

test/sanity/issue4877-inject-webview/test.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,4 +45,8 @@
4545
assert(len(elems) == 1)
4646
finally:
4747
driver.quit()
48-
server.terminate()
48+
import platform
49+
if platform.system() == 'Windows':
50+
subprocess.call(['taskkill', '/F', '/T', '/PID', str(server.pid)])
51+
else:
52+
server.terminate()

test/sanity/issue5087-webview-cleardata/test.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,4 +43,8 @@
4343
print result
4444
finally:
4545
driver.quit()
46-
server.terminate()
46+
import platform
47+
if platform.system() == 'Windows':
48+
subprocess.call(['taskkill', '/F', '/T', '/PID', str(server.pid)])
49+
else:
50+
server.terminate()

test/sanity/webview-node-remote/test.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,5 +41,9 @@
4141
print result
4242
assert('version = v' in result)
4343
finally:
44-
server.terminate()
44+
import platform
45+
if platform.system() == 'Windows':
46+
subprocess.call(['taskkill', '/F', '/T', '/PID', str(server.pid)])
47+
else:
48+
server.terminate()
4549
driver.quit()

0 commit comments

Comments
 (0)