From 903198a724aec10e28a2a6e74612452c6650b88a Mon Sep 17 00:00:00 2001 From: Joel Martin Date: Thu, 14 Mar 2013 12:24:58 -0500 Subject: [PATCH] tests: use new module path and remove Hixie code. --- tests/echo.py | 2 +- tests/load.py | 2 +- tests/utf8-list.py | 8 +++----- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/tests/echo.py b/tests/echo.py index 878c31a..d79553e 100755 --- a/tests/echo.py +++ b/tests/echo.py @@ -11,7 +11,7 @@ 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__) + "/../") +sys.path.insert(0,os.path.dirname(__file__) + "/../websockify") from websocket import WebSocketServer class WebSocketEcho(WebSocketServer): diff --git a/tests/load.py b/tests/load.py index 0501f7d..0da7265 100755 --- a/tests/load.py +++ b/tests/load.py @@ -7,7 +7,7 @@ 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__) + "/../") +sys.path.insert(0,os.path.dirname(__file__) + "/../websockify") from websocket import WebSocketServer class WebSocketLoad(WebSocketServer): diff --git a/tests/utf8-list.py b/tests/utf8-list.py index 5a36da0..60a8ae7 100755 --- a/tests/utf8-list.py +++ b/tests/utf8-list.py @@ -6,17 +6,15 @@ 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__) + "/../") +sys.path.insert(0,os.path.dirname(__file__) + "/../websockify") from websocket import WebSocketServer if __name__ == '__main__': - print "val: hixie | hybi_base64 | hybi_binary" + print "val: hybi_base64 | hybi_binary" for c in range(0, 256): - hixie = WebSocketServer.encode_hixie(chr(c)) hybi_base64 = WebSocketServer.encode_hybi(chr(c), opcode=1, base64=True) hybi_binary = WebSocketServer.encode_hybi(chr(c), opcode=2, base64=False) - print "%d: %s | %s | %s" % (c, repr(hixie), repr(hybi_base64), - repr(hybi_binary)) + print "%d: %s | %s" % (c, repr(hybi_base64), repr(hybi_binary))