diff options
author | Yury Selivanov <yury@magic.io> | 2018-05-28 18:31:55 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-05-28 18:31:55 -0400 |
commit | 7165754b6b5f3b7c07050d921fa1c58bba5f0ff1 (patch) | |
tree | a459d092b94d1c8e9498842192735f8486dd926e /Lib/test | |
parent | 416c1ebd9896b394790dcb4f9f035b1a44ebe9ff (diff) | |
download | cpython-7165754b6b5f3b7c07050d921fa1c58bba5f0ff1.tar.gz cpython-7165754b6b5f3b7c07050d921fa1c58bba5f0ff1.zip |
bpo-32410: Avoid blocking on file IO in sendfile fallback code (GH-7172)
Diffstat (limited to 'Lib/test')
-rw-r--r-- | Lib/test/test_asyncio/test_base_events.py | 3 | ||||
-rw-r--r-- | Lib/test/test_asyncio/test_events.py | 11 |
2 files changed, 14 insertions, 0 deletions
diff --git a/Lib/test/test_asyncio/test_base_events.py b/Lib/test/test_asyncio/test_base_events.py index 8566a9d5504..11e9465d392 100644 --- a/Lib/test/test_asyncio/test_base_events.py +++ b/Lib/test/test_asyncio/test_base_events.py @@ -1818,12 +1818,15 @@ class BaseLoopSockSendfileTests(test_utils.TestCase): @classmethod def setUpClass(cls): + cls.__old_bufsize = constants.SENDFILE_FALLBACK_READBUFFER_SIZE + constants.SENDFILE_FALLBACK_READBUFFER_SIZE = 1024 * 16 with open(support.TESTFN, 'wb') as fp: fp.write(cls.DATA) super().setUpClass() @classmethod def tearDownClass(cls): + constants.SENDFILE_FALLBACK_READBUFFER_SIZE = cls.__old_bufsize support.unlink(support.TESTFN) super().tearDownClass() diff --git a/Lib/test/test_asyncio/test_events.py b/Lib/test/test_asyncio/test_events.py index 39d85e8df07..e7c4fa6cece 100644 --- a/Lib/test/test_asyncio/test_events.py +++ b/Lib/test/test_asyncio/test_events.py @@ -2160,6 +2160,17 @@ class SockSendfileMixin(SendfileBase): async def wait_closed(self): await self.fut + @classmethod + def setUpClass(cls): + cls.__old_bufsize = constants.SENDFILE_FALLBACK_READBUFFER_SIZE + constants.SENDFILE_FALLBACK_READBUFFER_SIZE = 1024 * 16 + super().setUpClass() + + @classmethod + def tearDownClass(cls): + constants.SENDFILE_FALLBACK_READBUFFER_SIZE = cls.__old_bufsize + super().tearDownClass() + def set_socket_opts(self, sock): # On macOS, SO_SNDBUF is reset by connect(). So this method # should be called after the socket is connected. |