summaryrefslogtreecommitdiff
path: root/tests/websocket_test.py
diff options
context:
space:
mode:
authorRyan Williams <rdw@lindenlab.com>2010-05-06 00:02:18 -0700
committerRyan Williams <rdw@lindenlab.com>2010-05-06 00:02:18 -0700
commit3231d3145d792d77f282d2ffe70d702b5baac158 (patch)
tree00ea20615694fbaba1200be63a8d6437cab4c06e /tests/websocket_test.py
parent9809ee09124b9a4b054ff6929933a08530bb2adf (diff)
downloadeventlet-3231d3145d792d77f282d2ffe70d702b5baac158.tar.gz
Not really sure what close=True means in a makefile call, but apparently some versions of Python don't like it. Removed the file objects entirely to sidestep the issue.
Diffstat (limited to 'tests/websocket_test.py')
-rw-r--r--tests/websocket_test.py28
1 files changed, 8 insertions, 20 deletions
diff --git a/tests/websocket_test.py b/tests/websocket_test.py
index b9b8493..3e9ea59 100644
--- a/tests/websocket_test.py
+++ b/tests/websocket_test.py
@@ -103,11 +103,8 @@ class TestWebSocket(_TestBase):
sock = eventlet.connect(
('localhost', self.port))
- fd = sock.makefile('rw', close=True)
- fd.write('\r\n'.join(connect) + '\r\n\r\n')
- fd.flush()
+ sock.sendall('\r\n'.join(connect) + '\r\n\r\n')
result = sock.recv(1024)
- fd.close()
## The server responds the correct Websocket handshake
self.assertEqual(result,
'\r\n'.join(['HTTP/1.1 101 Web Socket Protocol Handshake',
@@ -128,24 +125,17 @@ class TestWebSocket(_TestBase):
sock = eventlet.connect(
('localhost', self.port))
- fd = sock.makefile('rw', close=True)
- fd.write('\r\n'.join(connect) + '\r\n\r\n')
- fd.flush()
+ sock.sendall('\r\n'.join(connect) + '\r\n\r\n')
first_resp = sock.recv(1024)
- fd.write('\x00hello\xFF')
- fd.flush()
+ sock.sendall('\x00hello\xFF')
result = sock.recv(1024)
self.assertEqual(result, '\x00hello\xff')
- fd.write('\x00start')
- fd.flush()
- fd.write(' end\xff')
- fd.flush()
+ sock.sendall('\x00start')
+ eventlet.sleep(0.001)
+ sock.sendall(' end\xff')
result = sock.recv(1024)
self.assertEqual(result, '\x00start end\xff')
- fd.write('')
- fd.flush()
-
-
+ sock.close()
def test_getting_messages_from_websocket(self):
connect = [
@@ -159,9 +149,7 @@ class TestWebSocket(_TestBase):
sock = eventlet.connect(
('localhost', self.port))
- fd = sock.makefile('rw', close=True)
- fd.write('\r\n'.join(connect) + '\r\n\r\n')
- fd.flush()
+ sock.sendall('\r\n'.join(connect) + '\r\n\r\n')
resp = sock.recv(1024)
headers, result = resp.split('\r\n\r\n')
msgs = [result.strip('\x00\xff')]