0a1
> import pytest
3d3
< import unittest
6a7
> from conftest import option, skip_alert
14,15c15,16
< def setUp(self):
< super().setUp()
---
> def setup_method(self):
> super().setup_method()
17,23c18,20
< self.assertIn(
< 'success',
< self.conf(
< {'http': {'websocket': {'keepalive_interval': 0}}}, 'settings'
< ),
< 'clear keepalive_interval',
< )
---
> assert 'success' in self.conf(
> {'http': {'websocket': {'keepalive_interval': 0}}}, 'settings'
> ), 'clear keepalive_interval'
25,27c22
< self.skip_alerts.extend(
< [r'socket close\(\d+\) failed']
< )
---
> skip_alert(r'socket close\(\d+\) failed')
30c25
< self.assertEqual(self.recvall(sock, read_timeout=0.1), b'', 'empty soc')
---
> assert self.recvall(sock, read_timeout=0.1) == b'', 'empty soc'
39,41c34,36
< self.assertEqual(frame['fin'], True, 'close fin')
< self.assertEqual(frame['opcode'], self.ws.OP_CLOSE, 'close opcode')
< self.assertEqual(frame['code'], code, 'close code')
---
> assert frame['fin'] == True, 'close fin'
> assert frame['opcode'] == self.ws.OP_CLOSE, 'close opcode'
> assert frame['code'] == code, 'close code'
52,54c47,49
< self.assertEqual(frame['fin'], fin, 'fin')
< self.assertEqual(frame['opcode'], opcode, 'opcode')
< self.assertEqual(data, payload, 'payload')
---
> assert frame['fin'] == fin, 'fin'
> assert frame['opcode'] == opcode, 'opcode'
> assert data == payload, 'payload'
62,69c57,62
< self.assertEqual(resp['status'], 101, 'status')
< self.assertEqual(resp['headers']['Upgrade'], 'websocket', 'upgrade')
< self.assertEqual(
< resp['headers']['Connection'], 'Upgrade', 'connection'
< )
< self.assertEqual(
< resp['headers']['Sec-WebSocket-Accept'], self.ws.accept(key), 'key'
< )
---
> assert resp['status'] == 101, 'status'
> assert resp['headers']['Upgrade'] == 'websocket', 'upgrade'
> assert resp['headers']['Connection'] == 'Upgrade', 'connection'
> assert resp['headers']['Sec-WebSocket-Accept'] == self.ws.accept(
> key
> ), 'key'
81c74
< self.assertEqual(message, frame['data'].decode('utf-8'), 'mirror')
---
> assert message == frame['data'].decode('utf-8'), 'mirror'
86c79
< self.assertEqual(message, frame['data'].decode('utf-8'), 'mirror 2')
---
> assert message == frame['data'].decode('utf-8'), 'mirror 2'
101,102c94,95
< self.assertEqual(frame['opcode'], self.ws.OP_CLOSE, 'no mask opcode')
< self.assertEqual(frame['code'], 1002, 'no mask close code')
---
> assert frame['opcode'] == self.ws.OP_CLOSE, 'no mask opcode'
> assert frame['code'] == 1002, 'no mask close code'
119,123c112,114
< self.assertEqual(
< message + ' ' + message,
< frame['data'].decode('utf-8'),
< 'mirror framing',
< )
---
> assert message + ' ' + message == frame['data'].decode(
> 'utf-8'
> ), 'mirror framing'
139,152c130,139
< self.assertDictEqual(
< frame,
< {
< 'fin': True,
< 'rsv1': False,
< 'rsv2': False,
< 'rsv3': False,
< 'opcode': self.ws.OP_CLOSE,
< 'mask': 0,
< 'code': 1002,
< 'reason': 'Fragmented control frame',
< },
< 'close frame',
< )
---
> assert frame == {
> 'fin': True,
> 'rsv1': False,
> 'rsv2': False,
> 'rsv3': False,
> 'opcode': self.ws.OP_CLOSE,
> 'mask': 0,
> 'code': 1002,
> 'reason': 'Fragmented control frame',
> }, 'close frame'
171,172c158,159
< self.assertEqual(message1, frame1['data'].decode('utf-8'), 'client 1')
< self.assertEqual(message2, frame2['data'].decode('utf-8'), 'client 2')
---
> assert message1 == frame1['data'].decode('utf-8'), 'client 1'
> assert message2 == frame2['data'].decode('utf-8'), 'client 2'
177c164
< @unittest.skip('not yet')
---
> @pytest.mark.skip('not yet')
193c180
< self.assertEqual(resp['status'], 400, 'upgrade absent')
---
> assert resp['status'] == 400, 'upgrade absent'
210c197
< self.assertEqual(resp['status'], 101, 'status')
---
> assert resp['status'] == 101, 'status'
212c199
< @unittest.skip('not yet')
---
> @pytest.mark.skip('not yet')
226c213
< self.assertEqual(resp['status'], 400, 'status')
---
> assert resp['status'] == 400, 'status'
241c228
< self.assertEqual(resp['status'], 426, 'status')
---
> assert resp['status'] == 426, 'status'
243c230
< @unittest.skip('not yet')
---
> @pytest.mark.skip('not yet')
258c245
< self.assertEqual(resp['status'], 400, 'key length')
---
> assert resp['status'] == 400, 'key length'
272,274c259
< self.assertEqual(
< resp['status'], 400, 'key double'
< ) # FAIL https://tools.ietf.org/html/rfc6455#section-11.3.1
---
> assert resp['status'] == 400, 'key double' # FAIL https://tools.ietf.org/html/rfc6455#section-11.3.1
290c275
< self.assertEqual(resp['status'], 400, 'status')
---
> assert resp['status'] == 400, 'status'
307c292
< self.assertEqual(resp['status'], 400, 'status')
---
> assert resp['status'] == 400, 'status'
324c309
< self.assertEqual(resp['status'], 400, 'status')
---
> assert resp['status'] == 400, 'status'
341,348c326,331
< self.assertEqual(resp['status'], 101, 'status')
< self.assertEqual(resp['headers']['Upgrade'], 'websocket', 'upgrade')
< self.assertEqual(
< resp['headers']['Connection'], 'Upgrade', 'connection'
< )
< self.assertEqual(
< resp['headers']['Sec-WebSocket-Accept'], self.ws.accept(key), 'key'
< )
---
> assert resp['status'] == 101, 'status'
> assert resp['headers']['Upgrade'] == 'websocket', 'upgrade'
> assert resp['headers']['Connection'] == 'Upgrade', 'connection'
> assert resp['headers']['Sec-WebSocket-Accept'] == self.ws.accept(
> key
> ), 'key'
445c428
< self.assertEqual(self.recvall(sock, read_timeout=0.1), b'', '2_7')
---
> assert self.recvall(sock, read_timeout=0.1) == b'', '2_7'
450c433
< self.assertEqual(self.recvall(sock, read_timeout=0.1), b'', '2_8')
---
> assert self.recvall(sock, read_timeout=0.1) == b'', '2_8'
490c473
< @unittest.skip('not yet')
---
> @pytest.mark.skip('not yet')
516c499
< self.assertEqual(self.recvall(sock, read_timeout=0.1), b'', 'empty 3_2')
---
> assert self.recvall(sock, read_timeout=0.1) == b'', 'empty 3_2'
534c517
< self.assertEqual(self.recvall(sock, read_timeout=0.1), b'', 'empty 3_3')
---
> assert self.recvall(sock, read_timeout=0.1) == b'', 'empty 3_3'
552c535
< self.assertEqual(self.recvall(sock, read_timeout=0.1), b'', 'empty 3_4')
---
> assert self.recvall(sock, read_timeout=0.1) == b'', 'empty 3_4'
738c721
< self.assertEqual(self.recvall(sock, read_timeout=0.1), b'', '5_4')
---
> assert self.recvall(sock, read_timeout=0.1) == b'', '5_4'
775c758
< self.assertEqual(self.recvall(sock, read_timeout=0.1), b'', '5_7')
---
> assert self.recvall(sock, read_timeout=0.1) == b'', '5_7'
959c942
< self.assertEqual(self.recvall(sock, read_timeout=0.1), b'', '5_20')
---
> assert self.recvall(sock, read_timeout=0.1) == b'', '5_20'
1092c1075
< self.assertEqual(self.recvall(sock, read_timeout=0.1), b'', 'empty soc')
---
> assert self.recvall(sock, read_timeout=0.1) == b'', 'empty soc'
1104c1087
< self.assertEqual(self.recvall(sock, read_timeout=0.1), b'', 'empty soc')
---
> assert self.recvall(sock, read_timeout=0.1) == b'', 'empty soc'
1117c1100
< self.assertEqual(self.recvall(sock, read_timeout=0.1), b'', 'empty soc')
---
> assert self.recvall(sock, read_timeout=0.1) == b'', 'empty soc'
1132c1115
< self.assertEqual(self.recvall(sock, read_timeout=0.1), b'', 'empty soc')
---
> assert self.recvall(sock, read_timeout=0.1) == b'', 'empty soc'
1252,1254c1235,1237
< def test_java_websockets_9_1_1__9_6_6(self):
< if not self.unsafe:
< self.skipTest("unsafe, long run")
---
> def test_java_websockets_9_1_1__9_6_6(self, is_unsafe):
> if not is_unsafe:
> pytest.skip('unsafe, long run')
1258,1266c1241,1246
< self.assertIn(
< 'success',
< self.conf(
< {
< 'http': {
< 'websocket': {
< 'max_frame_size': 33554432,
< 'keepalive_interval': 0,
< }
---
> assert 'success' in self.conf(
> {
> 'http': {
> 'websocket': {
> 'max_frame_size': 33554432,
> 'keepalive_interval': 0,
1268,1272c1248,1251
< },
< 'settings',
< ),
< 'increase max_frame_size and keepalive_interval',
< )
---
> }
> },
> 'settings',
> ), 'increase max_frame_size and keepalive_interval'
1313c1292
< if self.system != 'Darwin' and self.system != 'FreeBSD':
---
> if option.system != 'Darwin' and option.system != 'FreeBSD':
1369,1375c1348,1350
< self.assertIn(
< 'success',
< self.conf(
< {'http': {'websocket': {'max_frame_size': 100}}}, 'settings'
< ),
< 'configure max_frame_size',
< )
---
> assert 'success' in self.conf(
> {'http': {'websocket': {'max_frame_size': 100}}}, 'settings'
> ), 'configure max_frame_size'
1395,1401c1370,1372
< self.assertIn(
< 'success',
< self.conf(
< {'http': {'websocket': {'read_timeout': 5}}}, 'settings'
< ),
< 'configure read_timeout',
< )
---
> assert 'success' in self.conf(
> {'http': {'websocket': {'read_timeout': 5}}}, 'settings'
> ), 'configure read_timeout'
1415,1421c1386,1388
< self.assertIn(
< 'success',
< self.conf(
< {'http': {'websocket': {'keepalive_interval': 5}}}, 'settings'
< ),
< 'configure keepalive_interval',
< )
---
> assert 'success' in self.conf(
> {'http': {'websocket': {'keepalive_interval': 5}}}, 'settings'
> ), 'configure keepalive_interval'
1434,1437d1400
<
<
< if __name__ == '__main__':
< TestJavaWebsockets.main()