Skip to content

Commit 6ca78af

Browse files
serhiy-storchakaserhiy-storchaka
authored
bpo-23819: Get rid of assert statements in test_asyncio (GH-30212)
To keep checks even if run tests with optimized Python. Either use special assertion methods like assertEqual() or raise an AssertionError explicitly.
1 parent 7c5c3f7 commit 6ca78af

File tree

10 files changed

+102
-63
lines changed

10 files changed

+102
-63
lines changed

‎Lib/test/test_asyncio/test_base_events.py‎

Lines changed: 19 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -647,7 +647,7 @@ def run_loop():
647647
'Exception in callback.*zero'),
648648
exc_info=(ZeroDivisionError, MOCK_ANY, MOCK_ANY))
649649

650-
assert not mock_handler.called
650+
self.assertFalse(mock_handler.called)
651651

652652
def test_set_exc_handler_broken(self):
653653
def run_loop():
@@ -1007,22 +1007,26 @@ def __init__(self, create_future=False):
10071007
if create_future:
10081008
self.done = asyncio.get_running_loop().create_future()
10091009

1010+
def _assert_state(self, *expected):
1011+
if self.state not in expected:
1012+
raise AssertionError(f'state: {self.state!r}, expected: {expected!r}')
1013+
10101014
def connection_made(self, transport):
10111015
self.transport = transport
1012-
assert self.state == 'INITIAL', self.state
1016+
self._assert_state('INITIAL')
10131017
self.state = 'CONNECTED'
10141018
transport.write(b'GET / HTTP/1.0\r\nHost: example.com\r\n\r\n')
10151019

10161020
def data_received(self, data):
1017-
assert self.state == 'CONNECTED', self.state
1021+
self._assert_state('CONNECTED')
10181022
self.nbytes += len(data)
10191023

10201024
def eof_received(self):
1021-
assert self.state == 'CONNECTED', self.state
1025+
self._assert_state('CONNECTED')
10221026
self.state = 'EOF'
10231027

10241028
def connection_lost(self, exc):
1025-
assert self.state in ('CONNECTED', 'EOF'), self.state
1029+
self._assert_state('CONNECTED', 'EOF')
10261030
self.state = 'CLOSED'
10271031
if self.done:
10281032
self.done.set_result(None)
@@ -1037,20 +1041,24 @@ def __init__(self, create_future=False, loop=None):
10371041
if create_future:
10381042
self.done = loop.create_future()
10391043

1044+
def _assert_state(self, expected):
1045+
if self.state != expected:
1046+
raise AssertionError(f'state: {self.state!r}, expected: {expected!r}')
1047+
10401048
def connection_made(self, transport):
10411049
self.transport = transport
1042-
assert self.state == 'INITIAL', self.state
1050+
self._assert_state('INITIAL')
10431051
self.state = 'INITIALIZED'
10441052

10451053
def datagram_received(self, data, addr):
1046-
assert self.state == 'INITIALIZED', self.state
1054+
self._assert_state('INITIALIZED')
10471055
self.nbytes += len(data)
10481056

10491057
def error_received(self, exc):
1050-
assert self.state == 'INITIALIZED', self.state
1058+
self._assert_state('INITIALIZED')
10511059

10521060
def connection_lost(self, exc):
1053-
assert self.state == 'INITIALIZED', self.state
1061+
self._assert_state('INITIALIZED')
10541062
self.state = 'CLOSED'
10551063
if self.done:
10561064
self.done.set_result(None)
@@ -1399,7 +1407,7 @@ def test_create_connection_bluetooth(self, m_socket):
13991407
addr = ('00:01:02:03:04:05', 1)
14001408

14011409
def getaddrinfo(host, port, *args, **kw):
1402-
assert (host, port) == addr
1410+
self.assertEqual((host, port), addr)
14031411
return [(999, 1, 999, '', (addr, 1))]
14041412

14051413
m_socket.getaddrinfo = getaddrinfo
@@ -1698,7 +1706,7 @@ def test_create_datagram_endpoint_sock_unix(self):
16981706
lambda: MyDatagramProto(create_future=True, loop=self.loop),
16991707
family=socket.AF_UNIX)
17001708
transport, protocol = self.loop.run_until_complete(fut)
1701-
assert transport._sock.family == socket.AF_UNIX
1709+
self.assertEqual(transport._sock.family, socket.AF_UNIX)
17021710
transport.close()
17031711
self.loop.run_until_complete(protocol.done)
17041712
self.assertEqual('CLOSED', protocol.state)

‎Lib/test/test_asyncio/test_events.py‎

Lines changed: 40 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -88,23 +88,27 @@ def __init__(self, loop=None):
8888
self.connected = loop.create_future()
8989
self.done = loop.create_future()
9090

91+
def _assert_state(self, *expected):
92+
if self.state not in expected:
93+
raise AssertionError(f'state: {self.state!r}, expected: {expected!r}')
94+
9195
def connection_made(self, transport):
9296
self.transport = transport
93-
assert self.state == 'INITIAL', self.state
97+
self._assert_state('INITIAL')
9498
self.state = 'CONNECTED'
9599
if self.connected:
96100
self.connected.set_result(None)
97101

98102
def data_received(self, data):
99-
assert self.state == 'CONNECTED', self.state
103+
self._assert_state('CONNECTED')
100104
self.nbytes += len(data)
101105

102106
def eof_received(self):
103-
assert self.state == 'CONNECTED', self.state
107+
self._assert_state('CONNECTED')
104108
self.state = 'EOF'
105109

106110
def connection_lost(self, exc):
107-
assert self.state in ('CONNECTED', 'EOF'), self.state
111+
self._assert_state('CONNECTED', 'EOF')
108112
self.state = 'CLOSED'
109113
if self.done:
110114
self.done.set_result(None)
@@ -125,20 +129,24 @@ def __init__(self, loop=None):
125129
if loop is not None:
126130
self.done = loop.create_future()
127131

132+
def _assert_state(self, expected):
133+
if self.state != expected:
134+
raise AssertionError(f'state: {self.state!r}, expected: {expected!r}')
135+
128136
def connection_made(self, transport):
129137
self.transport = transport
130-
assert self.state == 'INITIAL', self.state
138+
self._assert_state('INITIAL')
131139
self.state = 'INITIALIZED'
132140

133141
def datagram_received(self, data, addr):
134-
assert self.state == 'INITIALIZED', self.state
142+
self._assert_state('INITIALIZED')
135143
self.nbytes += len(data)
136144

137145
def error_received(self, exc):
138-
assert self.state == 'INITIALIZED', self.state
146+
self._assert_state('INITIALIZED')
139147

140148
def connection_lost(self, exc):
141-
assert self.state == 'INITIALIZED', self.state
149+
self._assert_state('INITIALIZED')
142150
self.state = 'CLOSED'
143151
if self.done:
144152
self.done.set_result(None)
@@ -154,23 +162,27 @@ def __init__(self, loop=None):
154162
if loop is not None:
155163
self.done = loop.create_future()
156164

165+
def _assert_state(self, expected):
166+
if self.state != expected:
167+
raise AssertionError(f'state: {self.state!r}, expected: {expected!r}')
168+
157169
def connection_made(self, transport):
158170
self.transport = transport
159-
assert self.state == ['INITIAL'], self.state
171+
self._assert_state(['INITIAL'])
160172
self.state.append('CONNECTED')
161173

162174
def data_received(self, data):
163-
assert self.state == ['INITIAL', 'CONNECTED'], self.state
175+
self._assert_state(['INITIAL', 'CONNECTED'])
164176
self.nbytes += len(data)
165177

166178
def eof_received(self):
167-
assert self.state == ['INITIAL', 'CONNECTED'], self.state
179+
self._assert_state(['INITIAL', 'CONNECTED'])
168180
self.state.append('EOF')
169181

170182
def connection_lost(self, exc):
171183
if 'EOF' not in self.state:
172184
self.state.append('EOF') # It is okay if EOF is missed.
173-
assert self.state == ['INITIAL', 'CONNECTED', 'EOF'], self.state
185+
self._assert_state(['INITIAL', 'CONNECTED', 'EOF'])
174186
self.state.append('CLOSED')
175187
if self.done:
176188
self.done.set_result(None)
@@ -185,13 +197,17 @@ def __init__(self, loop=None):
185197
if loop is not None:
186198
self.done = loop.create_future()
187199

200+
def _assert_state(self, expected):
201+
if self.state != expected:
202+
raise AssertionError(f'state: {self.state!r}, expected: {expected!r}')
203+
188204
def connection_made(self, transport):
189205
self.transport = transport
190-
assert self.state == 'INITIAL', self.state
206+
self._assert_state('INITIAL')
191207
self.state = 'CONNECTED'
192208

193209
def connection_lost(self, exc):
194-
assert self.state == 'CONNECTED', self.state
210+
self._assert_state('CONNECTED')
195211
self.state = 'CLOSED'
196212
if self.done:
197213
self.done.set_result(None)
@@ -210,31 +226,35 @@ def __init__(self, loop):
210226
self.got_data = {1: asyncio.Event(),
211227
2: asyncio.Event()}
212228

229+
def _assert_state(self, expected):
230+
if self.state != expected:
231+
raise AssertionError(f'state: {self.state!r}, expected: {expected!r}')
232+
213233
def connection_made(self, transport):
214234
self.transport = transport
215-
assert self.state == 'INITIAL', self.state
235+
self._assert_state('INITIAL')
216236
self.state = 'CONNECTED'
217237
self.connected.set_result(None)
218238

219239
def connection_lost(self, exc):
220-
assert self.state == 'CONNECTED', self.state
240+
self._assert_state('CONNECTED')
221241
self.state = 'CLOSED'
222242
self.completed.set_result(None)
223243

224244
def pipe_data_received(self, fd, data):
225-
assert self.state == 'CONNECTED', self.state
245+
self._assert_state('CONNECTED')
226246
self.data[fd] += data
227247
self.got_data[fd].set()
228248

229249
def pipe_connection_lost(self, fd, exc):
230-
assert self.state == 'CONNECTED', self.state
250+
self._assert_state('CONNECTED')
231251
if exc:
232252
self.disconnects[fd].set_exception(exc)
233253
else:
234254
self.disconnects[fd].set_result(exc)
235255

236256
def process_exited(self):
237-
assert self.state == 'CONNECTED', self.state
257+
self._assert_state('CONNECTED')
238258
self.returncode = self.transport.get_returncode()
239259

240260

@@ -1284,7 +1304,7 @@ def test_create_datagram_endpoint_sock(self):
12841304
else:
12851305
break
12861306
else:
1287-
assert False, 'Can not create socket.'
1307+
self.fail('Can not create socket.')
12881308

12891309
f = self.loop.create_datagram_endpoint(
12901310
lambda: MyDatagramProto(loop=self.loop), sock=sock)

‎Lib/test/test_asyncio/test_futures.py‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -54,30 +54,30 @@ def done(self):
5454
or self.__exception is not None)
5555

5656
def result(self):
57-
assert not self.cancelled()
57+
self.assertFalse(self.cancelled())
5858
if self.__exception is not None:
5959
raise self.__exception
6060
return self.__result
6161

6262
def exception(self):
63-
assert not self.cancelled()
63+
self.assertFalse(self.cancelled())
6464
return self.__exception
6565

6666
def set_result(self, result):
67-
assert not self.done()
68-
assert result is not None
67+
self.assertFalse(self.done())
68+
self.assertIsNotNone(result)
6969
self.__result = result
7070

7171
def set_exception(self, exception):
72-
assert not self.done()
73-
assert exception is not None
72+
self.assertFalse(self.done())
73+
self.assertIsNotNone(exception)
7474
self.__exception = exception
7575

7676
def __iter__(self):
7777
if not self.done():
7878
self._asyncio_future_blocking = True
7979
yield self
80-
assert self.done()
80+
self.assertTrue(self.done())
8181
return self.result()
8282

8383

@@ -91,12 +91,12 @@ def setUp(self):
9191
def test_wrap_future(self):
9292
f = DuckFuture()
9393
g = asyncio.wrap_future(f)
94-
assert g is f
94+
self.assertIs(g, f)
9595

9696
def test_ensure_future(self):
9797
f = DuckFuture()
9898
g = asyncio.ensure_future(f)
99-
assert g is f
99+
self.assertIs(g, f)
100100

101101

102102
class BaseFutureTests:

‎Lib/test/test_asyncio/test_sendfile.py‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,25 +36,29 @@ def __init__(self, loop=None, close_after=0):
3636
self.data = bytearray()
3737
self.close_after = close_after
3838

39+
def _assert_state(self, *expected):
40+
if self.state not in expected:
41+
raise AssertionError(f'state: {self.state!r}, expected: {expected!r}')
42+
3943
def connection_made(self, transport):
4044
self.transport = transport
41-
assert self.state == 'INITIAL', self.state
45+
self._assert_state('INITIAL')
4246
self.state = 'CONNECTED'
4347
if self.connected:
4448
self.connected.set_result(None)
4549

4650
def eof_received(self):
47-
assert self.state == 'CONNECTED', self.state
51+
self._assert_state('CONNECTED')
4852
self.state = 'EOF'
4953

5054
def connection_lost(self, exc):
51-
assert self.state in ('CONNECTED', 'EOF'), self.state
55+
self._assert_state('CONNECTED', 'EOF')
5256
self.state = 'CLOSED'
5357
if self.done:
5458
self.done.set_result(None)
5559

5660
def data_received(self, data):
57-
assert self.state == 'CONNECTED', self.state
61+
self._assert_state('CONNECTED')
5862
self.nbytes += len(data)
5963
self.data.extend(data)
6064
super().data_received(data)

‎Lib/test/test_asyncio/test_sock_lowlevel.py‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,24 +23,28 @@ def __init__(self, loop=None):
2323
self.connected = loop.create_future()
2424
self.done = loop.create_future()
2525

26+
def _assert_state(self, *expected):
27+
if self.state not in expected:
28+
raise AssertionError(f'state: {self.state!r}, expected: {expected!r}')
29+
2630
def connection_made(self, transport):
2731
self.transport = transport
28-
assert self.state == 'INITIAL', self.state
32+
self._assert_state('INITIAL')
2933
self.state = 'CONNECTED'
3034
if self.connected:
3135
self.connected.set_result(None)
3236
transport.write(b'GET / HTTP/1.0\r\nHost: example.com\r\n\r\n')
3337

3438
def data_received(self, data):
35-
assert self.state == 'CONNECTED', self.state
39+
self._assert_state('CONNECTED')
3640
self.nbytes += len(data)
3741

3842
def eof_received(self):
39-
assert self.state == 'CONNECTED', self.state
43+
self._assert_state('CONNECTED')
4044
self.state = 'EOF'
4145

4246
def connection_lost(self, exc):
43-
assert self.state in ('CONNECTED', 'EOF'), self.state
47+
self._assert_state('CONNECTED', 'EOF')
4448
self.state = 'CLOSED'
4549
if self.done:
4650
self.done.set_result(None)
@@ -451,7 +455,7 @@ def test_create_connection_sock(self):
451455
else:
452456
break
453457
else:
454-
assert False, 'Can not create socket.'
458+
self.fail('Can not create socket.')
455459

456460
f = self.loop.create_connection(
457461
lambda: MyProto(loop=self.loop), sock=sock)

‎Lib/test/test_asyncio/test_sslproto.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -383,9 +383,9 @@ def connection_made(self, tr):
383383
def get_buffer(self, sizehint):
384384
return self.buf
385385

386-
def buffer_updated(self, nsize):
387-
assert nsize == 1
388-
self.on_data.set_result(bytes(self.buf[:nsize]))
386+
def buffer_updated(slf, nsize):
387+
self.assertEqual(nsize, 1)
388+
slf.on_data.set_result(bytes(slf.buf[:nsize]))
389389

390390
class ClientProtoSecond(asyncio.Protocol):
391391
def __init__(self, on_data, on_eof):

0 commit comments

Comments
 (0)