Skip to content

Commit d386169

Browse files
committed
Revert "Fix offset with connection backlog - adapted the tests - created new tests for 0 and 1 connections"
This reverts commit 17d39e9.
1 parent 17d39e9 commit d386169

File tree

2 files changed

+3
-16
lines changed

2 files changed

+3
-16
lines changed

Lib/asyncio/selector_events.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ def _accept_connection(
173173
# listening socket has triggered an EVENT_READ. There may be multiple
174174
# connections waiting for an .accept() so it is called in a loop.
175175
# See https://bugs.python.org/issue27906 for more details.
176-
for _ in range(backlog + 1):
176+
for _ in range(backlog):
177177
try:
178178
conn, addr = sock.accept()
179179
if self._debug:

Lib/test/test_asyncio/test_selector_events.py

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -347,19 +347,6 @@ def test_process_events_write_cancelled(self):
347347
selectors.EVENT_WRITE)])
348348
self.loop._remove_writer.assert_called_with(1)
349349

350-
def test_accept_connection_zero_one(self):
351-
for backlog in [0, 1]:
352-
sock = mock.Mock()
353-
sock.accept.return_value = (mock.Mock(), mock.Mock())
354-
with self.subTest(backlog):
355-
mock_obj = mock.patch.object
356-
with mock_obj(self.loop, '_accept_connection2') as accept2_mock:
357-
self.loop._accept_connection(
358-
mock.Mock(), sock, backlog=backlog)
359-
self.loop.run_until_complete(asyncio.sleep(0))
360-
print("Accepted vs Backlog:", sock.accept.call_count, backlog)
361-
self.assertEqual(sock.accept.call_count, backlog + 1)
362-
363350
def test_accept_connection_multiple(self):
364351
sock = mock.Mock()
365352
sock.accept.return_value = (mock.Mock(), mock.Mock())
@@ -375,7 +362,7 @@ def test_accept_connection_multiple(self):
375362
self.loop._accept_connection(
376363
mock.Mock(), sock, backlog=backlog)
377364
self.loop.run_until_complete(asyncio.sleep(0))
378-
self.assertEqual(sock.accept.call_count, backlog + 1)
365+
self.assertEqual(sock.accept.call_count, backlog)
379366

380367
def test_accept_connection_skip_connectionabortederror(self):
381368
sock = mock.Mock()
@@ -401,7 +388,7 @@ def mock_sock_accept():
401388
# as in test_accept_connection_multiple avoid task pending
402389
# warnings by using asyncio.sleep(0)
403390
self.loop.run_until_complete(asyncio.sleep(0))
404-
self.assertEqual(sock.accept.call_count, backlog + 1)
391+
self.assertEqual(sock.accept.call_count, backlog)
405392

406393
class SelectorTransportTests(test_utils.TestCase):
407394

0 commit comments

Comments
 (0)