{{ message }}
-
-
Notifications
You must be signed in to change notification settings - Fork 35.4k
gh-93357: Lay the foundation for further work in asyncio.test_streams: port server cases to IsolatedAsyncioTestCase
#93369
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.
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
Merged
gvanrossum
merged 11 commits into
python:main
from
arhadthedev:teststreams-utilsTestCase-servers
Oct 4, 2022
Merged
Changes from all commits
Commits
Show all changes
11 commits
Select commit
Hold shift + click to select a range
a052bf7
Port server cases to IsolatedAsyncioTestCase
arhadthedev 1f8977b
Add forgotten setUp and tearDown into StreamTests2
arhadthedev 3205970
Use subtests to localize errors
arhadthedev 9f32482
Fix a wrongly used address
arhadthedev e41c7ca
Fix another typo
arhadthedev 35e4f26
Remove manual server starting
arhadthedev 92e30e5
Address a review of Serhiy Storchaka
arhadthedev e706f2c
Merge branch 'main' into teststreams-utilsTestCase-servers
arhadthedev 690e451
Merge branch 'main' into teststreams-utilsTestCase-servers
arhadthedev cabc398
Merge branch 'main' into teststreams-utilsTestCase-servers
gvanrossum dcc10dd
Remove a What's New entry as proposed by Nikita Sobolev
arhadthedev File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -566,46 +566,10 @@ def test_exception_cancel(self): | |
| test_utils.run_briefly(self.loop) | ||
| self.assertIs(stream._waiter, None) | ||
|
|
||
| def test_start_server(self): | ||
|
|
||
| class MyServer: | ||
|
|
||
| def __init__(self, loop): | ||
| self.server = None | ||
| self.loop = loop | ||
|
|
||
| async def handle_client(self, client_reader, client_writer): | ||
| data = await client_reader.readline() | ||
| client_writer.write(data) | ||
| await client_writer.drain() | ||
| client_writer.close() | ||
| await client_writer.wait_closed() | ||
|
|
||
| def start(self): | ||
| sock = socket.create_server(('127.0.0.1', 0)) | ||
| self.server = self.loop.run_until_complete( | ||
| asyncio.start_server(self.handle_client, | ||
| sock=sock)) | ||
| return sock.getsockname() | ||
|
|
||
| def handle_client_callback(self, client_reader, client_writer): | ||
| self.loop.create_task(self.handle_client(client_reader, | ||
| client_writer)) | ||
|
|
||
| def start_callback(self): | ||
| sock = socket.create_server(('127.0.0.1', 0)) | ||
| addr = sock.getsockname() | ||
| sock.close() | ||
| self.server = self.loop.run_until_complete( | ||
| asyncio.start_server(self.handle_client_callback, | ||
| host=addr[0], port=addr[1])) | ||
| return addr | ||
|
|
||
| def stop(self): | ||
| if self.server is not None: | ||
| self.server.close() | ||
| self.loop.run_until_complete(self.server.wait_closed()) | ||
| self.server = None | ||
|
|
||
| class NewStreamTests(unittest.IsolatedAsyncioTestCase): | ||
|
|
||
| async def test_start_server(self): | ||
|
|
||
| async def client(addr): | ||
| reader, writer = await asyncio.open_connection(*addr) | ||
|
|
@@ -617,61 +581,43 @@ async def client(addr): | |
| await writer.wait_closed() | ||
| return msgback | ||
|
|
||
| messages = [] | ||
| self.loop.set_exception_handler(lambda loop, ctx: messages.append(ctx)) | ||
|
|
||
| # test the server variant with a coroutine as client handler | ||
| server = MyServer(self.loop) | ||
| addr = server.start() | ||
| msg = self.loop.run_until_complete(self.loop.create_task(client(addr))) | ||
| server.stop() | ||
| self.assertEqual(msg, b"hello world!\n") | ||
| async def handle_client(client_reader, client_writer): | ||
| data = await client_reader.readline() | ||
| client_writer.write(data) | ||
| await client_writer.drain() | ||
| client_writer.close() | ||
| await client_writer.wait_closed() | ||
|
|
||
| with self.subTest(msg="coroutine"): | ||
| server = await asyncio.start_server( | ||
| handle_client, | ||
| host=socket_helper.HOSTv4 | ||
| ) | ||
| addr = server.sockets[0].getsockname() | ||
| msg = await client(addr) | ||
| server.close() | ||
| await server.wait_closed() | ||
| self.assertEqual(msg, b"hello world!\n") | ||
|
|
||
| # test the server variant with a callback as client handler | ||
| server = MyServer(self.loop) | ||
| addr = server.start_callback() | ||
| msg = self.loop.run_until_complete(self.loop.create_task(client(addr))) | ||
| server.stop() | ||
| self.assertEqual(msg, b"hello world!\n") | ||
| with self.subTest(msg="callback"): | ||
| async def handle_client_callback(client_reader, client_writer): | ||
| asyncio.get_running_loop().create_task( | ||
| handle_client(client_reader, client_writer) | ||
| ) | ||
|
|
||
| self.assertEqual(messages, []) | ||
| server = await asyncio.start_server( | ||
| handle_client_callback, | ||
| host=socket_helper.HOSTv4 | ||
| ) | ||
| addr = server.sockets[0].getsockname() | ||
| reader, writer = await asyncio.open_connection(*addr) | ||
| msg = await client(addr) | ||
| server.close() | ||
| await server.wait_closed() | ||
| self.assertEqual(msg, b"hello world!\n") | ||
|
|
||
| @socket_helper.skip_unless_bind_unix_socket | ||
| def test_start_unix_server(self): | ||
|
|
||
| class MyServer: | ||
|
|
||
| def __init__(self, loop, path): | ||
| self.server = None | ||
| self.loop = loop | ||
| self.path = path | ||
|
|
||
| async def handle_client(self, client_reader, client_writer): | ||
| data = await client_reader.readline() | ||
| client_writer.write(data) | ||
| await client_writer.drain() | ||
| client_writer.close() | ||
| await client_writer.wait_closed() | ||
|
|
||
| def start(self): | ||
| self.server = self.loop.run_until_complete( | ||
| asyncio.start_unix_server(self.handle_client, | ||
| path=self.path)) | ||
|
|
||
| def handle_client_callback(self, client_reader, client_writer): | ||
| self.loop.create_task(self.handle_client(client_reader, | ||
| client_writer)) | ||
|
|
||
| def start_callback(self): | ||
| start = asyncio.start_unix_server(self.handle_client_callback, | ||
| path=self.path) | ||
| self.server = self.loop.run_until_complete(start) | ||
|
|
||
| def stop(self): | ||
| if self.server is not None: | ||
| self.server.close() | ||
| self.loop.run_until_complete(self.server.wait_closed()) | ||
| self.server = None | ||
| async def test_start_unix_server(self): | ||
|
|
||
| async def client(path): | ||
| reader, writer = await asyncio.open_unix_connection(path) | ||
|
|
@@ -683,64 +629,42 @@ async def client(path): | |
| await writer.wait_closed() | ||
| return msgback | ||
|
|
||
| messages = [] | ||
| self.loop.set_exception_handler(lambda loop, ctx: messages.append(ctx)) | ||
|
|
||
| # test the server variant with a coroutine as client handler | ||
| with test_utils.unix_socket_path() as path: | ||
| server = MyServer(self.loop, path) | ||
| server.start() | ||
| msg = self.loop.run_until_complete( | ||
| self.loop.create_task(client(path))) | ||
| server.stop() | ||
| self.assertEqual(msg, b"hello world!\n") | ||
|
|
||
| # test the server variant with a callback as client handler | ||
| with test_utils.unix_socket_path() as path: | ||
| server = MyServer(self.loop, path) | ||
| server.start_callback() | ||
| msg = self.loop.run_until_complete( | ||
| self.loop.create_task(client(path))) | ||
| server.stop() | ||
| self.assertEqual(msg, b"hello world!\n") | ||
|
|
||
| self.assertEqual(messages, []) | ||
| async def handle_client(client_reader, client_writer): | ||
| data = await client_reader.readline() | ||
| client_writer.write(data) | ||
| await client_writer.drain() | ||
| client_writer.close() | ||
| await client_writer.wait_closed() | ||
|
|
||
| with self.subTest(msg="coroutine"): | ||
| with test_utils.unix_socket_path() as path: | ||
| server = await asyncio.start_unix_server( | ||
| handle_client, | ||
| path=path | ||
| ) | ||
| msg = await client(path) | ||
| server.close() | ||
| await server.wait_closed() | ||
| self.assertEqual(msg, b"hello world!\n") | ||
|
|
||
| with self.subTest(msg="callback"): | ||
| async def handle_client_callback(client_reader, client_writer): | ||
| asyncio.get_running_loop().create_task( | ||
| handle_client(client_reader, client_writer) | ||
| ) | ||
|
|
||
| with test_utils.unix_socket_path() as path: | ||
| server = await asyncio.start_unix_server( | ||
| handle_client_callback, | ||
| path=path | ||
| ) | ||
| msg = await client(path) | ||
| server.close() | ||
| await server.wait_closed() | ||
| self.assertEqual(msg, b"hello world!\n") | ||
|
|
||
| @unittest.skipIf(ssl is None, 'No ssl module') | ||
| def test_start_tls(self): | ||
|
|
||
| class MyServer: | ||
|
|
||
| def __init__(self, loop): | ||
| self.server = None | ||
| self.loop = loop | ||
|
|
||
| async def handle_client(self, client_reader, client_writer): | ||
| data1 = await client_reader.readline() | ||
| client_writer.write(data1) | ||
| await client_writer.drain() | ||
| assert client_writer.get_extra_info('sslcontext') is None | ||
| await client_writer.start_tls( | ||
| test_utils.simple_server_sslcontext()) | ||
| assert client_writer.get_extra_info('sslcontext') is not None | ||
| data2 = await client_reader.readline() | ||
| client_writer.write(data2) | ||
| await client_writer.drain() | ||
| client_writer.close() | ||
| await client_writer.wait_closed() | ||
|
|
||
| def start(self): | ||
| sock = socket.create_server(('127.0.0.1', 0)) | ||
| self.server = self.loop.run_until_complete( | ||
| asyncio.start_server(self.handle_client, | ||
| sock=sock)) | ||
| return sock.getsockname() | ||
|
|
||
| def stop(self): | ||
| if self.server is not None: | ||
| self.server.close() | ||
| self.loop.run_until_complete(self.server.wait_closed()) | ||
| self.server = None | ||
| async def test_start_tls(self): | ||
|
|
||
| async def client(addr): | ||
| reader, writer = await asyncio.open_connection(*addr) | ||
|
|
@@ -757,18 +681,49 @@ async def client(addr): | |
| await writer.wait_closed() | ||
| return msgback1, msgback2 | ||
|
|
||
| messages = [] | ||
| self.loop.set_exception_handler(lambda loop, ctx: messages.append(ctx)) | ||
|
|
||
| server = MyServer(self.loop) | ||
| addr = server.start() | ||
| msg1, msg2 = self.loop.run_until_complete(client(addr)) | ||
| server.stop() | ||
|
|
||
| self.assertEqual(messages, []) | ||
| async def handle_client(client_reader, client_writer): | ||
| data1 = await client_reader.readline() | ||
| client_writer.write(data1) | ||
| await client_writer.drain() | ||
| assert client_writer.get_extra_info('sslcontext') is None | ||
| await client_writer.start_tls( | ||
| test_utils.simple_server_sslcontext()) | ||
| assert client_writer.get_extra_info('sslcontext') is not None | ||
|
|
||
| data2 = await client_reader.readline() | ||
| client_writer.write(data2) | ||
| await client_writer.drain() | ||
| client_writer.close() | ||
| await client_writer.wait_closed() | ||
|
|
||
| server = await asyncio.start_server( | ||
| handle_client, | ||
| host=socket_helper.HOSTv4 | ||
| ) | ||
| addr = server.sockets[0].getsockname() | ||
|
|
||
| msg1, msg2 = await client(addr) | ||
| server.close() | ||
| await server.wait_closed() | ||
| self.assertEqual(msg1, b"hello world 1!\n") | ||
| self.assertEqual(msg2, b"hello world 2!\n") | ||
|
|
||
|
|
||
| class StreamTests2(test_utils.TestCase): | ||
|
|
||
| def setUp(self): | ||
| super().setUp() | ||
| self.loop = asyncio.new_event_loop() | ||
| self.set_event_loop(self.loop) | ||
|
|
||
| def tearDown(self): | ||
| # just in case if we have transport close callbacks | ||
| test_utils.run_briefly(self.loop) | ||
|
|
||
| self.loop.close() | ||
| gc.collect() | ||
| super().tearDown() | ||
|
|
||
| @unittest.skipIf(sys.platform == 'win32', "Don't have pipes") | ||
| def test_read_all_from_pipe_reader(self): | ||
| # See asyncio issue 168. This test is derived from the example | ||
|
|
@@ -986,22 +941,20 @@ def test_LimitOverrunError_pickleable(self): | |
| self.assertEqual(str(e), str(e2)) | ||
| self.assertEqual(e.consumed, e2.consumed) | ||
|
|
||
| def test_wait_closed_on_close(self): | ||
| with test_utils.run_test_server() as httpd: | ||
| 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)) | ||
|
|
||
| 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') | ||
| f = rd.read() | ||
| data = self.loop.run_until_complete(f) | ||
| 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()) | ||
| self.loop.run_until_complete(wr.wait_closed()) | ||
| await wr.wait_closed() | ||
|
|
||
| def test_wait_closed_on_close_with_unread_data(self): | ||
| with test_utils.run_test_server() as httpd: | ||
|
|
@@ -1057,15 +1010,10 @@ async def inner(httpd): | |
|
|
||
| self.assertEqual(messages, []) | ||
|
|
||
| def test_eof_feed_when_closing_writer(self): | ||
| async def test_eof_feed_when_closing_writer(self): | ||
| # See http://bugs.python.org/issue35065 | ||
| messages = [] | ||
| self.loop.set_exception_handler(lambda loop, ctx: messages.append(ctx)) | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Looks like
Member
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Yes, I've removed all usages of
because the server is now async, lives in a main thread, and needs no intermediary to pass exceptions into a test harness.
Member
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. By the way, thank you for noticing, I've added the clarification as the second paragraph of the first PR comment. |
||
|
|
||
| with test_utils.run_test_server() as httpd: | ||
| rd, wr = self.loop.run_until_complete( | ||
| asyncio.open_connection(*httpd.address)) | ||
|
|
||
| async 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) | ||
|
|
@@ -1074,8 +1022,6 @@ def test_eof_feed_when_closing_writer(self): | |
| data = self.loop.run_until_complete(f) | ||
| self.assertEqual(data, b'') | ||
|
|
||
| self.assertEqual(messages, []) | ||
|
|
||
|
|
||
| if __name__ == '__main__': | ||
| unittest.main() | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
You can’t perform that action at this time.
Uh oh!
There was an error while loading. Please reload this page.