more test fixes for async support

Author: tshirtman

examples/thread_example.py

@@ -1,3 +1,4 @@
+import sys
 from time import sleep
 
 from oscpy.server import OSCThreadServer

examples/trio_example.py

@@ -24,6 +24,11 @@ async def stop(*values):
         print(f"time to leave!")
         await osc.stop_all()
 
+    @osc.address("/info")
+    async def info():
+        address, port = osc.getaddress()
+        print(address, port)
+
     await osc.process()
 
 trio.run(osc_app, '0.0.0.0', 8000)

oscpy/server/asyncio_server.py

@@ -55,6 +55,7 @@ async def handle_message(self, data, sender, sender_socket):
 
     async def _execute_callbacks(self, callbacks_list, address, values):
         for cb, get_address in callbacks_list:
+            result = None
             try:
                 if get_address:
                     result = cb(address, *values)
@@ -69,6 +70,9 @@ async def _execute_callbacks(self, callbacks_list, address, values):
                     logger.exception("Ignoring unhandled exception caught in oscpy server")
                 else:
                     raise
+            finally:
+                if result:
+                    del result
 
     def stop(self, sock=None):
         """Close and remove a socket from the server's sockets.
@@ -82,6 +86,8 @@ def stop(self, sock=None):
         if sock in self.sockets:
             sock.close()
             self.sockets.remove(sock)
+            if sock is self.default_socket:
+                self.default_socket = None
         else:
             raise RuntimeError('{} is not one of my sockets!'.format(sock))
 

oscpy/server/thread_server.py

@@ -42,6 +42,8 @@ def stop(self, s=None):
             if s in read:
                 s.recvfrom(UDP_MAX_SIZE)
             self.sockets.remove(s)
+            if s is self.default_socket:
+                self.default_socket = None
         else:
             raise RuntimeError('{} is not one of my sockets!'.format(s))
 

oscpy/server/trio_server.py

@@ -84,7 +84,7 @@ async def stop(self, sock):
         nursery = self.nurseries.pop(sock)
         nursery.cancel_scope.deadline = 0
 
-    async def getaddress(self, sock=None):
+    def getaddress(self, sock=None):
         """Wrap call to getsockname.
 
         If `sock` is None, uses the default socket for the server.
@@ -97,4 +97,4 @@ async def getaddress(self, sock=None):
         elif not sock:
             raise RuntimeError('no default socket yet and no socket provided')
 
-        return await sock.getsockname()
+        return sock.getsockname()

tests/test_server.py

@@ -43,33 +43,34 @@ def test_listen(cls):
 @pytest.mark.parametrize("cls", server_classes)
 def test_getaddress(cls):
     osc = cls()
-    sock = osc.listen()
+    sock = _await(osc.listen, osc)
     assert osc.getaddress(sock)[0] == '127.0.0.1'
 
     with pytest.raises(RuntimeError):
         osc.getaddress()
 
-    sock2 = osc.listen(default=True)
+    sock2 = _await(osc.listen, osc, kwargs=dict(default=True))
     assert osc.getaddress(sock2)[0] == '127.0.0.1'
     runner(osc, timeout=1, socket=sock)
 
 
 @pytest.mark.parametrize("cls", server_classes)
 def test_listen_default(cls):
     osc = cls()
-    sock = osc.listen(default=True)
+    sock = _await(osc.listen, osc, kwargs=dict(default=True))
 
     with pytest.raises(RuntimeError) as e_info:  # noqa
-        osc.listen(default=True)
+        # osc.listen(default=True)
+        _await(osc.listen, osc, kwargs=dict(default=True))
 
     osc.close(sock)
-    osc.listen(default=True)
+    _await(osc.listen, osc, kwargs=dict(default=True))
 
 
 @pytest.mark.parametrize("cls", server_classes)
 def test_close(cls):
     osc = cls()
-    osc.listen(default=True)
+    _await(osc.listen, osc, kwargs=dict(default=True))
 
     osc.close()
     with pytest.raises(RuntimeError) as e_info:  # noqa
@@ -81,7 +82,8 @@ def test_close(cls):
 def test_close_unix(cls):
     osc = cls()
     filename = mktemp()
-    unix = osc.listen(address=filename, family='unix')
+    # unix = osc.listen(address=filename, family='unix')
+    unix = _await(osc.listen, osc, kwargs=dict(address=filename, family='unix'))
     assert exists(filename)
     osc.close(unix)
     assert not exists(filename)
@@ -97,7 +99,7 @@ def test_stop_unknown(cls):
 @pytest.mark.parametrize("cls", server_classes - {OSCCurioServer})
 def test_stop_default(cls):
     osc = cls()
-    osc.listen(default=True)
+    _await(osc.listen, osc, kwargs=dict(default=True))
     assert len(osc.sockets) == 1
     osc.stop()
     assert len(osc.sockets) == 0
@@ -106,14 +108,14 @@ def test_stop_default(cls):
 @pytest.mark.parametrize("cls", server_classes - {OSCCurioServer})
 def test_stop_all(cls):
     osc = cls()
-    sock = osc.listen(default=True)
+    sock = _await(osc.listen, osc, kwargs=dict(default=True))
     host, port = sock.getsockname()
-    osc.listen()
+    sock2 = _await(osc.listen, osc)
     assert len(osc.sockets) == 2
     osc.stop_all()
     assert len(osc.sockets) == 0
     sleep(.1)
-    osc.listen(address=host, port=port)
+    sock3 = _await(osc.listen, osc, kwargs=dict(default=True))
     assert len(osc.sockets) == 1
     osc.stop_all()