@@ -190,7 +190,6 @@ def half_close_connection_local(self, code=1000, reason="close"):
190
190
close_frame_data = Close (code , reason ).serialize ()
191
191
# Trigger the closing handshake from the local endpoint.
192
192
close_task = self .loop .create_task (self .protocol .close (code , reason ))
193
- self .run_loop_once () # wait_for executes
194
193
self .run_loop_once () # write_frame executes
195
194
# Empty the outgoing data stream so we can make assertions later on.
196
195
self .assertOneFrameSent (True , OP_CLOSE , close_frame_data )
@@ -919,6 +918,7 @@ def test_answer_ping_does_not_crash_if_connection_closing(self):
919
918
close_task = self .half_close_connection_local ()
920
919
921
920
self .receive_frame (Frame (True , OP_PING , b"test" ))
921
+ self .run_loop_once ()
922
922
923
923
with self .assertNoLogs ():
924
924
self .loop .run_until_complete (self .protocol .close ())
@@ -931,6 +931,7 @@ def test_answer_ping_does_not_crash_if_connection_closed(self):
931
931
# which prevents responding with a pong frame properly.
932
932
self .receive_frame (Frame (True , OP_PING , b"test" ))
933
933
self .receive_eof ()
934
+ self .run_loop_once ()
934
935
935
936
with self .assertNoLogs ():
936
937
self .loop .run_until_complete (self .protocol .close ())
@@ -1362,6 +1363,7 @@ def test_remote_close_and_connection_lost(self):
1362
1363
# which prevents echoing the close frame properly.
1363
1364
self .receive_frame (self .close_frame )
1364
1365
self .receive_eof ()
1366
+ self .run_loop_once ()
1365
1367
1366
1368
with self .assertNoLogs ():
1367
1369
self .loop .run_until_complete (self .protocol .close (reason = "oh noes!" ))
@@ -1375,6 +1377,7 @@ def test_simultaneous_close(self):
1375
1377
# https://github.com/aaugustin/websockets/issues/339
1376
1378
self .loop .call_soon (self .receive_frame , self .remote_close )
1377
1379
self .loop .call_soon (self .receive_eof_if_client )
1380
+ self .run_loop_once ()
1378
1381
1379
1382
self .loop .run_until_complete (self .protocol .close (reason = "local" ))
1380
1383
@@ -1386,6 +1389,7 @@ def test_simultaneous_close(self):
1386
1389
1387
1390
def test_close_preserves_incoming_frames (self ):
1388
1391
self .receive_frame (Frame (True , OP_TEXT , b"hello" ))
1392
+ self .run_loop_once ()
1389
1393
1390
1394
self .loop .call_later (MS , self .receive_frame , self .close_frame )
1391
1395
self .loop .call_later (MS , self .receive_eof_if_client )
@@ -1573,6 +1577,7 @@ def test_local_close_connection_lost_timeout_after_write_eof(self):
1573
1577
# HACK: disable write_eof => other end drops connection emulation.
1574
1578
self .transport ._eof = True
1575
1579
self .receive_frame (self .close_frame )
1580
+ self .run_loop_once ()
1576
1581
self .loop .run_until_complete (self .protocol .close (reason = "close" ))
1577
1582
self .assertConnectionClosed (1000 , "close" )
1578
1583
@@ -1589,6 +1594,7 @@ def test_local_close_connection_lost_timeout_after_close(self):
1589
1594
# HACK: disable close => other end drops connection emulation.
1590
1595
self .transport ._closing = True
1591
1596
self .receive_frame (self .close_frame )
1597
+ self .run_loop_once ()
1592
1598
self .loop .run_until_complete (self .protocol .close (reason = "close" ))
1593
1599
self .assertConnectionClosed (1000 , "close" )
1594
1600
@@ -1631,6 +1637,7 @@ def test_local_close_connection_lost_timeout_after_write_eof(self):
1631
1637
# HACK: disable write_eof => other end drops connection emulation.
1632
1638
self .transport ._eof = True
1633
1639
self .receive_frame (self .close_frame )
1640
+ self .run_loop_once ()
1634
1641
self .loop .run_until_complete (self .protocol .close (reason = "close" ))
1635
1642
self .assertConnectionClosed (1000 , "close" )
1636
1643
@@ -1650,5 +1657,6 @@ def test_local_close_connection_lost_timeout_after_close(self):
1650
1657
# HACK: disable close => other end drops connection emulation.
1651
1658
self .transport ._closing = True
1652
1659
self .receive_frame (self .close_frame )
1660
+ self .run_loop_once ()
1653
1661
self .loop .run_until_complete (self .protocol .close (reason = "close" ))
1654
1662
self .assertConnectionClosed (1000 , "close" )
0 commit comments