summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorPeter Åstrand (astrand) <astrand@cendio.se>2013-11-28 13:33:28 +0100
committerPeter Åstrand (astrand) <astrand@cendio.se>2013-11-28 13:33:28 +0100
commit047ce477423066830e523b937dc8122fc21fcefd (patch)
tree80e50760f458f328521fad03fe9b2844232a307f /tests
parent558402848e9fc5b9ec7136144149dd71e3c0c32a (diff)
downloadwebsockify-047ce477423066830e523b937dc8122fc21fcefd.tar.gz
Rename new_client to new_websocket_client, in order to have a better
name in the SocketServer/HTTPServer request handler hierarchy. Prepare for merge pull request #72. This work has been picked out of 7b3dd8a6f5ef26dbfd6c34a91600ea1613aefaa2 .
Diffstat (limited to 'tests')
-rwxr-xr-xtests/echo.py2
-rwxr-xr-xtests/echo.rb2
-rwxr-xr-xtests/load.py2
-rw-r--r--tests/test_websocketproxy.py2
4 files changed, 4 insertions, 4 deletions
diff --git a/tests/echo.py b/tests/echo.py
index 6ad0651..ad83296 100755
--- a/tests/echo.py
+++ b/tests/echo.py
@@ -20,7 +20,7 @@ class WebSocketEcho(WebSocketServer):
client. """
buffer_size = 8096
- def new_client(self):
+ def new_websocket_client(self):
"""
Echo back whatever is received.
"""
diff --git a/tests/echo.rb b/tests/echo.rb
index 6a5493c..8db7dd3 100755
--- a/tests/echo.rb
+++ b/tests/echo.rb
@@ -12,7 +12,7 @@ require 'websocket'
class WebSocketEcho < WebSocketServer
# Echo back whatever is received
- def new_client(client)
+ def new_websocket_client(client)
cqueue = []
c_pend = 0
diff --git a/tests/load.py b/tests/load.py
index f142fa1..fdff106 100755
--- a/tests/load.py
+++ b/tests/load.py
@@ -29,7 +29,7 @@ class WebSocketLoad(WebSocketServer):
WebSocketServer.__init__(self, *args, **kwargs)
- def new_client(self):
+ def new_websocket_client(self):
self.send_cnt = 0
self.recv_cnt = 0
diff --git a/tests/test_websocketproxy.py b/tests/test_websocketproxy.py
index 0fdd0fb..cf940ae 100644
--- a/tests/test_websocketproxy.py
+++ b/tests/test_websocketproxy.py
@@ -124,4 +124,4 @@ class WebSocketProxyTest(unittest.TestCase):
return ins, outs, excepts
self.stubs.Set(select, 'select', mock_select)
- self.assertRaises(Exception, web_socket_proxy.new_client)
+ self.assertRaises(Exception, web_socket_proxy.new_websocket_client)