diff options
author | Peter Åstrand (astrand) <astrand@cendio.se> | 2013-11-28 09:14:25 +0100 |
---|---|---|
committer | Peter Åstrand (astrand) <astrand@cendio.se> | 2013-11-28 09:14:25 +0100 |
commit | 81e2a53692dd83f13c98c988bad19fe2f2bc52d8 (patch) | |
tree | a881e4851f4d6c0689841b8b58102ccd8d4961db | |
parent | 602248425ab0ed958445647859ba0f7ddf8bb28a (diff) | |
parent | 13c99bcf053f7f3af8ba84c0d963a9591e020f49 (diff) | |
download | websockify-81e2a53692dd83f13c98c988bad19fe2f2bc52d8.tar.gz |
Merge commit '13c99bcf053f7f3af8ba84c0d963a9591e020f49'
* commit '13c99bcf053f7f3af8ba84c0d963a9591e020f49':
Fix search path construction in tests.
-rwxr-xr-x | tests/echo.py | 4 | ||||
-rwxr-xr-x | tests/load.py | 4 | ||||
-rwxr-xr-x | tests/utf8-list.py | 5 |
3 files changed, 6 insertions, 7 deletions
diff --git a/tests/echo.py b/tests/echo.py index 9b1d9a6..27bdc46 100755 --- a/tests/echo.py +++ b/tests/echo.py @@ -11,8 +11,8 @@ as taken from http://docs.python.org/dev/library/ssl.html#certificates ''' import os, sys, select, optparse -sys.path.insert(0,os.path.dirname(__file__) + "/../websockify") -from websocket import WebSocketServer, WebSocketRequestHandler +sys.path.insert(0,os.path.join(os.path.dirname(__file__), "..")) +from websockify.websocket import WebSocketServer, WebSocketRequestHandler class WebSocketEcho(WebSocketRequestHandler): """ diff --git a/tests/load.py b/tests/load.py index bd32e68..2565368 100755 --- a/tests/load.py +++ b/tests/load.py @@ -7,8 +7,8 @@ given a sequence number. Any errors are reported and counted. ''' import sys, os, select, random, time, optparse -sys.path.insert(0,os.path.dirname(__file__) + "/../websockify") -from websocket import WebSocketServer, WebSocketRequestHandler +sys.path.insert(0,os.path.join(os.path.dirname(__file__), "..")) +from websockify.websocket import WebSocketServer, WebSocketRequestHandler class WebSocketLoadServer(WebSocketServer): diff --git a/tests/utf8-list.py b/tests/utf8-list.py index 60a8ae7..77bd430 100755 --- a/tests/utf8-list.py +++ b/tests/utf8-list.py @@ -5,9 +5,8 @@ Display UTF-8 encoding for 0-255.''' import sys, os, socket, ssl, time, traceback from select import select - -sys.path.insert(0,os.path.dirname(__file__) + "/../websockify") -from websocket import WebSocketServer +sys.path.insert(0,os.path.join(os.path.dirname(__file__), "..")) +from websockify.websocket import WebSocketServer if __name__ == '__main__': print "val: hybi_base64 | hybi_binary" |