Merge pull request #171 from xconnio/fix-leave-timeout

Wait for goodbye result before closing WebSocket connection

Author: om26er

pyproject.toml

@@ -35,6 +35,7 @@ test = [
   "pytest",
   "pytest-asyncio",
   "ruff",
+  "pytest-timeout",
 ]
 publish = ["twine", "build"]
 dev = ["wampproto@git+https://github.com/xconnio/wampproto-python"]

tests/client_test.py

@@ -0,0 +1,12 @@
+import pytest
+
+from xconn import Client
+from tests.utils import ROUTER_URL, REALM
+
+
+@pytest.mark.timeout(10)
+@pytest.mark.parametrize("url", ROUTER_URL)
+def test_session_leave(url: str):
+    client = Client()
+    session = client.connect(url, REALM)
+    session.leave()

tests/interop_test.py

@@ -3,13 +3,10 @@
 
 from xconn import Client, AsyncClient
 from xconn.types import Result, Event, Invocation
+from tests.utils import ROUTER_URL, REALM
 
-XCONN_URL = "ws://localhost:8080/ws"
-CROSSBAR_URL = "ws://localhost:8081/ws"
-REALM = "realm1"
 PROCEDURE_ADD = "io.xconn.backend.add2"
 
-ROUTER_URL = [XCONN_URL, CROSSBAR_URL]
 SERIALIZERS = [serializers.JSONSerializer(), serializers.CBORSerializer(), serializers.MsgPackSerializer()]
 AUTHENTICATORS = [
     auth.AnonymousAuthenticator(""),

tests/utils.py

@@ -0,0 +1,4 @@
+XCONN_URL = "ws://localhost:8080/ws"
+CROSSBAR_URL = "ws://localhost:8081/ws"
+ROUTER_URL = [XCONN_URL, CROSSBAR_URL]
+REALM = "realm1"

xconn/session.py

@@ -245,9 +245,10 @@ def leave(self):
         goodbye = messages.Goodbye(messages.GoodbyeFields({}, uris.CLOSE_REALM))
         data = self.session.send_message(goodbye)
         self.base_session.send(data)
-        self.base_session.close()
-
-        return self.goodbye_request.result(timeout=10)
+        try:
+            self.goodbye_request.result(timeout=10)
+        finally:
+            self.base_session.close()
 
     def ping(self, timeout: int = 10) -> float:
         return self.base_session.transport.ping(timeout)