diff options
author | Joel Martin <github@martintribe.org> | 2012-10-31 15:51:23 -0500 |
---|---|---|
committer | Joel Martin <github@martintribe.org> | 2012-11-01 09:22:08 -0500 |
commit | 99e238901bcdce6d8e6ef32b310c64a6fca0216b (patch) | |
tree | 24e1229b39c658656720f3e12c7582e6ca29d7b1 /tests/socket_server.sh | |
parent | 2c4a776b6f48317127f9ea57d749484fc7b3741c (diff) |
Update websockify, fix websocket tests, refactor websocket harness.
- pull in websockify c00c0eed from
https://github.com/kanaka/websockify with one-shot socket listener
cleanup and other misc updates.
- import the WebSocketProxy class directly and launch it one-shot
using the run_once parameter rather than spawning a separate
websockify via shell.
- create a python version of socket_server.sh and in the harness and
remove socket_server.sh.
- refactor clean_pids to use a two phase cleanup where it sends
a SIGTERM (to give the parent the chance to cleanup children) and
then send a SIGTERM 1 second later. This still has risk of leaving
child processes around (for example, the nc process in the original
socket_server.sh which would also hold onto the listen port).
Conflicts:
tests/runner.py
Diffstat (limited to 'tests/socket_server.sh')
-rwxr-xr-x | tests/socket_server.sh | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/tests/socket_server.sh b/tests/socket_server.sh deleted file mode 100755 index 4fd2edb1..00000000 --- a/tests/socket_server.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -while true; do (/bin/echo -en "te\x01\xff\x79st\x02") | nc -vvvl 127.0.0.1 $1; done; - |