Tests: fixed websocket tests.
This commit is contained in:
@@ -198,16 +198,14 @@ class TestNodeWebsockets(TestApplicationNode):
|
||||
): # FAIL https://tools.ietf.org/html/rfc6455#section-4.2.1
|
||||
self.load('websockets/mirror')
|
||||
|
||||
key = self.ws.key()
|
||||
resp = self.get(
|
||||
headers={
|
||||
'Host': 'localhost',
|
||||
'Connection': 'Upgrade',
|
||||
'Sec-WebSocket-Key': key,
|
||||
'Sec-WebSocket-Key': self.ws.key(),
|
||||
'Sec-WebSocket-Protocol': 'chat',
|
||||
'Sec-WebSocket-Version': 13,
|
||||
},
|
||||
read_timeout=1,
|
||||
)
|
||||
|
||||
self.assertEqual(resp['status'], 400, 'upgrade absent')
|
||||
@@ -215,18 +213,17 @@ class TestNodeWebsockets(TestApplicationNode):
|
||||
def test_node_websockets_handshake_case_insensitive(self):
|
||||
self.load('websockets/mirror')
|
||||
|
||||
key = self.ws.key()
|
||||
resp = self.get(
|
||||
resp, sock, _ = self.ws.upgrade(
|
||||
headers={
|
||||
'Host': 'localhost',
|
||||
'Upgrade': 'WEBSOCKET',
|
||||
'Connection': 'UPGRADE',
|
||||
'Sec-WebSocket-Key': key,
|
||||
'Sec-WebSocket-Key': self.ws.key(),
|
||||
'Sec-WebSocket-Protocol': 'chat',
|
||||
'Sec-WebSocket-Version': 13,
|
||||
},
|
||||
read_timeout=1,
|
||||
}
|
||||
)
|
||||
sock.close()
|
||||
|
||||
self.assertEqual(resp['status'], 101, 'status')
|
||||
|
||||
@@ -234,16 +231,14 @@ class TestNodeWebsockets(TestApplicationNode):
|
||||
def test_node_websockets_handshake_connection_absent(self): # FAIL
|
||||
self.load('websockets/mirror')
|
||||
|
||||
key = self.ws.key()
|
||||
resp = self.get(
|
||||
headers={
|
||||
'Host': 'localhost',
|
||||
'Upgrade': 'websocket',
|
||||
'Sec-WebSocket-Key': key,
|
||||
'Sec-WebSocket-Key': self.ws.key(),
|
||||
'Sec-WebSocket-Protocol': 'chat',
|
||||
'Sec-WebSocket-Version': 13,
|
||||
},
|
||||
read_timeout=1,
|
||||
)
|
||||
|
||||
self.assertEqual(resp['status'], 400, 'status')
|
||||
@@ -251,16 +246,14 @@ class TestNodeWebsockets(TestApplicationNode):
|
||||
def test_node_websockets_handshake_version_absent(self):
|
||||
self.load('websockets/mirror')
|
||||
|
||||
key = self.ws.key()
|
||||
resp = self.get(
|
||||
headers={
|
||||
'Host': 'localhost',
|
||||
'Upgrade': 'websocket',
|
||||
'Connection': 'Upgrade',
|
||||
'Sec-WebSocket-Key': key,
|
||||
'Sec-WebSocket-Key': self.ws.key(),
|
||||
'Sec-WebSocket-Protocol': 'chat',
|
||||
},
|
||||
read_timeout=1,
|
||||
)
|
||||
|
||||
self.assertEqual(resp['status'], 426, 'status')
|
||||
@@ -278,7 +271,6 @@ class TestNodeWebsockets(TestApplicationNode):
|
||||
'Sec-WebSocket-Protocol': 'chat',
|
||||
'Sec-WebSocket-Version': 13,
|
||||
},
|
||||
read_timeout=1,
|
||||
)
|
||||
|
||||
self.assertEqual(resp['status'], 400, 'key length')
|
||||
@@ -293,7 +285,6 @@ class TestNodeWebsockets(TestApplicationNode):
|
||||
'Sec-WebSocket-Protocol': 'chat',
|
||||
'Sec-WebSocket-Version': 13,
|
||||
},
|
||||
read_timeout=1,
|
||||
)
|
||||
|
||||
self.assertEqual(
|
||||
@@ -303,17 +294,15 @@ class TestNodeWebsockets(TestApplicationNode):
|
||||
def test_node_websockets_handshake_method_invalid(self):
|
||||
self.load('websockets/mirror')
|
||||
|
||||
key = self.ws.key()
|
||||
resp = self.post(
|
||||
headers={
|
||||
'Host': 'localhost',
|
||||
'Upgrade': 'websocket',
|
||||
'Connection': 'Upgrade',
|
||||
'Sec-WebSocket-Key': key,
|
||||
'Sec-WebSocket-Key': self.ws.key(),
|
||||
'Sec-WebSocket-Protocol': 'chat',
|
||||
'Sec-WebSocket-Version': 13,
|
||||
},
|
||||
read_timeout=1,
|
||||
)
|
||||
|
||||
self.assertEqual(resp['status'], 400, 'status')
|
||||
@@ -321,18 +310,16 @@ class TestNodeWebsockets(TestApplicationNode):
|
||||
def test_node_websockets_handshake_http_10(self):
|
||||
self.load('websockets/mirror')
|
||||
|
||||
key = self.ws.key()
|
||||
resp = self.get(
|
||||
headers={
|
||||
'Host': 'localhost',
|
||||
'Upgrade': 'websocket',
|
||||
'Connection': 'Upgrade',
|
||||
'Sec-WebSocket-Key': key,
|
||||
'Sec-WebSocket-Key': self.ws.key(),
|
||||
'Sec-WebSocket-Protocol': 'chat',
|
||||
'Sec-WebSocket-Version': 13,
|
||||
},
|
||||
http_10=True,
|
||||
read_timeout=1,
|
||||
)
|
||||
|
||||
self.assertEqual(resp['status'], 400, 'status')
|
||||
@@ -340,18 +327,16 @@ class TestNodeWebsockets(TestApplicationNode):
|
||||
def test_node_websockets_handshake_uri_invalid(self):
|
||||
self.load('websockets/mirror')
|
||||
|
||||
key = self.ws.key()
|
||||
resp = self.get(
|
||||
headers={
|
||||
'Host': 'localhost',
|
||||
'Upgrade': 'websocket',
|
||||
'Connection': 'Upgrade',
|
||||
'Sec-WebSocket-Key': key,
|
||||
'Sec-WebSocket-Key': self.ws.key(),
|
||||
'Sec-WebSocket-Protocol': 'chat',
|
||||
'Sec-WebSocket-Version': 13,
|
||||
},
|
||||
url='!',
|
||||
read_timeout=1,
|
||||
)
|
||||
|
||||
self.assertEqual(resp['status'], 400, 'status')
|
||||
@@ -360,16 +345,16 @@ class TestNodeWebsockets(TestApplicationNode):
|
||||
self.load('websockets/mirror')
|
||||
|
||||
key = self.ws.key()
|
||||
resp = self.get(
|
||||
resp, sock, _ = self.ws.upgrade(
|
||||
headers={
|
||||
'Host': 'localhost',
|
||||
'Upgrade': 'websocket',
|
||||
'Connection': 'Upgrade',
|
||||
'Sec-WebSocket-Key': key,
|
||||
'Sec-WebSocket-Version': 13,
|
||||
},
|
||||
read_timeout=1,
|
||||
}
|
||||
)
|
||||
sock.close()
|
||||
|
||||
self.assertEqual(resp['status'], 101, 'status')
|
||||
self.assertEqual(resp['headers']['Upgrade'], 'websocket', 'upgrade')
|
||||
@@ -1166,7 +1151,7 @@ class TestNodeWebsockets(TestApplicationNode):
|
||||
|
||||
sock.close()
|
||||
|
||||
# 7_3_1 # FAIL
|
||||
# 7_3_1
|
||||
|
||||
_, sock, _ = self.ws.upgrade()
|
||||
|
||||
|
||||
Reference in New Issue
Block a user