fix: Release lock in __aexit__ only if acquired (#249)

empicano · Sep 19, 2023 · aedaf14 · aedaf14
1 parent 5f0c94c
commit aedaf14
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/aiomqtt/client.py b/aiomqtt/client.py
@@ -1066,7 +1066,8 @@ async def __aexit__(
                 )
         finally:
             self._force_disconnect()
-            self._lock.release()
+            if self._lock.locked():
+                self._lock.release()
 
 
 def _set_client_socket_defaults(

diff --git a/tests/test_client.py b/tests/test_client.py
@@ -87,6 +87,15 @@ async def test_topic_matches() -> None:
     assert not topic.matches("$test/group/a/b/c")
 
 
+async def test__aexit__() -> None:
+    """Test that it's possible to call __aexit__ without prior __aenter__.
+
+    This should also cover the case of an unsucessful __aenter__.
+    """
+    client = Client(HOSTNAME)
+    await client.__aexit__(None, None, None)
+
+
 @pytest.mark.network
 async def test_multiple_messages_generators() -> None:
     """Test that multiple Client.messages() generators can be used at the same time."""