Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

gh-93357: Port test cases to IsolatedAsyncioTestCase, part 2 #97896

Merged
merged 6 commits into from
Oct 5, 2022
Merged

gh-93357: Port test cases to IsolatedAsyncioTestCase, part 2 #97896

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
79505df
Port test cases to IsolatedAsyncioTestCase, part 2
arhadthedev Oct 5, 2022
a46c222
Remove self.loop.set_exception_handler
arhadthedev Oct 5, 2022
ee7e966
Another fix
arhadthedev Oct 5, 2022
bc21d76
Fix a misuse of async with
arhadthedev Oct 5, 2022
87e841c
Remove more asyncio.open_connection()
arhadthedev Oct 5, 2022
7b8caca
Return an assignment to data
arhadthedev Oct 5, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 15 additions & 29 deletions Lib/test/test_asyncio/test_streams.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -941,34 +941,32 @@ def test_LimitOverrunError_pickleable(self):
self.assertEqual(str(e), str(e2))
self.assertEqual(e.consumed, e2.consumed)

class NewStreamTests2(unittest.IsolatedAsyncioTestCase):
async def test_wait_closed_on_close(self):
async with test_utils.run_test_server() as httpd:
rd, wr = self.loop.run_until_complete(
asyncio.open_connection(*httpd.address))
with test_utils.run_test_server() as httpd:
rd, wr = await asyncio.open_connection(*httpd.address)

wr.write(b'GET / HTTP/1.0\r\n\r\n')
data = await rd.readline()
self.assertEqual(data, b'HTTP/1.0 200 OK\r\n')
await rd.read()
data = await rd.read()
self.assertTrue(data.endswith(b'\r\n\r\nTest message'))
self.assertFalse(wr.is_closing())
wr.close()
self.assertTrue(wr.is_closing())
await wr.wait_closed()

def test_wait_closed_on_close_with_unread_data(self):
async def test_wait_closed_on_close_with_unread_data(self):
with test_utils.run_test_server() as httpd:
rd, wr = self.loop.run_until_complete(
asyncio.open_connection(*httpd.address))
rd, wr = await asyncio.open_connection(*httpd.address)

wr.write(b'GET / HTTP/1.0\r\n\r\n')
f = rd.readline()
data = self.loop.run_until_complete(f)
data = await rd.readline()
self.assertEqual(data, b'HTTP/1.0 200 OK\r\n')
wr.close()
self.loop.run_until_complete(wr.wait_closed())
await wr.wait_closed()

def test_async_writer_api(self):
async def test_async_writer_api(self):
async def inner(httpd):
rd, wr = await asyncio.open_connection(*httpd.address)

Expand All @@ -980,15 +978,10 @@ async def inner(httpd):
wr.close()
await wr.wait_closed()

messages = []
self.loop.set_exception_handler(lambda loop, ctx: messages.append(ctx))

with test_utils.run_test_server() as httpd:
self.loop.run_until_complete(inner(httpd))

self.assertEqual(messages, [])
await inner(httpd)

def test_async_writer_api_exception_after_close(self):
async def test_async_writer_api_exception_after_close(self):
async def inner(httpd):
rd, wr = await asyncio.open_connection(*httpd.address)

Expand All @@ -1002,24 +995,17 @@ async def inner(httpd):
wr.write(b'data')
await wr.drain()

messages = []
self.loop.set_exception_handler(lambda loop, ctx: messages.append(ctx))

with test_utils.run_test_server() as httpd:
self.loop.run_until_complete(inner(httpd))

self.assertEqual(messages, [])
await inner(httpd)

async def test_eof_feed_when_closing_writer(self):
# See http://bugs.python.org/issue35065
async with test_utils.run_test_server() as httpd:
with test_utils.run_test_server() as httpd:
rd, wr = await asyncio.open_connection(*httpd.address)
wr.close()
f = wr.wait_closed()
self.loop.run_until_complete(f)
await wr.wait_closed()
self.assertTrue(rd.at_eof())
f = rd.read()
data = self.loop.run_until_complete(f)
data = await rd.read()
self.assertEqual(data, b'')


Expand Down