Merge commit '13c99bcf053f7f3af8ba84c0d963a9591e020f49'

* commit '13c99bcf053f7f3af8ba84c0d963a9591e020f49':
  Fix search path construction in tests.
This commit is contained in:
Peter Åstrand (astrand) 2013-11-28 09:14:25 +01:00
commit 81e2a53692
3 changed files with 6 additions and 7 deletions

View File

@ -11,8 +11,8 @@ as taken from http://docs.python.org/dev/library/ssl.html#certificates
''' '''
import os, sys, select, optparse import os, sys, select, optparse
sys.path.insert(0,os.path.dirname(__file__) + "/../websockify") sys.path.insert(0,os.path.join(os.path.dirname(__file__), ".."))
from websocket import WebSocketServer, WebSocketRequestHandler from websockify.websocket import WebSocketServer, WebSocketRequestHandler
class WebSocketEcho(WebSocketRequestHandler): class WebSocketEcho(WebSocketRequestHandler):
""" """

View File

@ -7,8 +7,8 @@ given a sequence number. Any errors are reported and counted.
''' '''
import sys, os, select, random, time, optparse import sys, os, select, random, time, optparse
sys.path.insert(0,os.path.dirname(__file__) + "/../websockify") sys.path.insert(0,os.path.join(os.path.dirname(__file__), ".."))
from websocket import WebSocketServer, WebSocketRequestHandler from websockify.websocket import WebSocketServer, WebSocketRequestHandler
class WebSocketLoadServer(WebSocketServer): class WebSocketLoadServer(WebSocketServer):

View File

@ -5,9 +5,8 @@ Display UTF-8 encoding for 0-255.'''
import sys, os, socket, ssl, time, traceback import sys, os, socket, ssl, time, traceback
from select import select from select import select
sys.path.insert(0,os.path.join(os.path.dirname(__file__), ".."))
sys.path.insert(0,os.path.dirname(__file__) + "/../websockify") from websockify.websocket import WebSocketServer
from websocket import WebSocketServer
if __name__ == '__main__': if __name__ == '__main__':
print "val: hybi_base64 | hybi_binary" print "val: hybi_base64 | hybi_binary"