Skip to content

bpo-47015: Update test_os from asyncore to asyncio #31876

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

Merged
asvetlov merged 15 commits into from
Mar 20, 2022
Merged

bpo-47015: Update test_os from asyncore to asyncio #31876

Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
b4c3d44
Convert TestSendfile to IsolatedAsyncioTestCase
arhadthedev Mar 14, 2022
51c5422
Make os.sendfile asynchronous
arhadthedev Mar 18, 2022
ee9dbe4
Use an asyncio-connected client
arhadthedev Mar 18, 2022
a3b9deb
Add and use an asyncio server
arhadthedev Mar 18, 2022
dcb4251
Turn client data reading loop into a comprehension
arhadthedev Mar 18, 2022
4cc7766
Remove redundant synchronization
arhadthedev Mar 16, 2022
8c90479
Remove an old, asyncore server
arhadthedev Mar 13, 2022
8fc1e78
Remove threading infrastructure
arhadthedev Mar 13, 2022
9882daf
Add a NEWS entry
arhadthedev Mar 14, 2022
3d66899
Merge branch 'main' into asyncio-test-os
arhadthedev Mar 18, 2022
475b7e5
Add an explicit asyncio event loop policy
arhadthedev Mar 18, 2022
ccb26dd
Address a review of merwok
arhadthedev Mar 18, 2022
34f198c
Address a review of asvetlov
arhadthedev Mar 19, 2022
005ad9a
Group server stuff together
arhadthedev Mar 19, 2022
03cae53
Fix a call of `async_sendfile` in `test_flags`
arhadthedev Mar 19, 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
Prev Previous commit
Next Next commit
Remove an old, asyncore server
  • Loading branch information
@arhadthedev
arhadthedev committed Mar 18, 2022
commit 8c904794ad4e0d781f32ec192b3b832e27da4750
91 changes: 0 additions & 91 deletions Lib/test/test_os.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,6 @@
from test.support import warnings_helper
from platform import win32_is_iot

with warnings.catch_warnings():
warnings.simplefilter('ignore', DeprecationWarning)
import asynchat
import asyncore

try:
import resource
except ImportError:
Expand Down Expand Up @@ -3222,92 +3217,6 @@ def test_set_get_priority(self):
raise


class SendfileTestServer(asyncore.dispatcher, threading.Thread):

class Handler(asynchat.async_chat):

def __init__(self, conn):
asynchat.async_chat.__init__(self, conn)
self.in_buffer = []
self.accumulate = True
self.closed = False
self.push(b"220 ready\r\n")

def handle_read(self):
data = self.recv(4096)
if self.accumulate:
self.in_buffer.append(data)

def get_data(self):
return b''.join(self.in_buffer)

def handle_close(self):
self.close()
self.closed = True

def handle_error(self):
raise

def __init__(self, address):
threading.Thread.__init__(self)
asyncore.dispatcher.__init__(self)
self.create_socket(socket.AF_INET, socket.SOCK_STREAM)
self.bind(address)
self.listen(5)
self.host, self.port = self.socket.getsockname()[:2]
self.handler_instance = None
self._active = False
self._active_lock = threading.Lock()

# --- public API

@property
def running(self):
return self._active

def start(self):
assert not self.running
self.__flag = threading.Event()
threading.Thread.start(self)
self.__flag.wait()

def stop(self):
assert self.running
self._active = False
self.join()

def wait(self):
# wait for handler connection to be closed, then stop the server
while not getattr(self.handler_instance, "closed", False):
time.sleep(0.001)
self.stop()

# --- internals

def run(self):
self._active = True
self.__flag.set()
while self._active and asyncore.socket_map:
self._active_lock.acquire()
asyncore.loop(timeout=0.001, count=1)
self._active_lock.release()
asyncore.close_all()

def handle_accept(self):
conn, addr = self.accept()
self.handler_instance = self.Handler(conn)

def handle_connect(self):
self.close()
handle_read = handle_connect

def writable(self):
return 0

def handle_error(self):
raise


@unittest.skipUnless(hasattr(os, 'sendfile'), "test needs os.sendfile()")
class TestSendfile(unittest.IsolatedAsyncioTestCase):

Expand Down