adds catch for other possible exception

Author: julianolm

Diff for: redis/asyncio/lock.py

@@ -178,6 +178,10 @@ async def __aexit__(self, exc_type, exc_value, traceback):
             if self.raise_on_release_error:
                 raise
             logger.warning("Lock was no longer owned when exiting context manager.")
+        except LockError:
+            if self.raise_on_release_error:
+                raise
+            logger.warning("Lock was unlocked when exiting context manager.")
 
     async def acquire(
         self,

Diff for: redis/lock.py

@@ -184,6 +184,10 @@ def __exit__(
             if self.raise_on_release_error:
                 raise
             logger.warning("Lock was no longer owned when exiting context manager.")
+        except LockError:
+            if self.raise_on_release_error:
+                raise
+            logger.warning("Lock was unlocked when exiting context manager.")
 
     def acquire(
         self,

Diff for: tests/test_asyncio/test_lock.py

@@ -129,7 +129,7 @@ async def test_context_manager_raises_when_locked_not_acquired(self, r):
             async with self.get_lock(r, "foo", blocking_timeout=0.1):
                 pass
 
-    async def test_context_manager_not_raise_on_release_error(self, r):
+    async def test_context_manager_not_raise_on_release_lock_not_owned_error(self, r):
         try:
             async with self.get_lock(
                 r, "foo", timeout=0.1, raise_on_release_error=False
@@ -144,6 +144,21 @@ async def test_context_manager_not_raise_on_release_error(self, r):
             ):
                 await asyncio.sleep(0.15)
 
+    async def test_context_manager_not_raise_on_release_lock_error(self, r):
+        try:
+            async with self.get_lock(
+                r, "foo", timeout=0.1, raise_on_release_error=False
+            ) as lock:
+                lock.release()
+        except LockError:
+            pytest.fail("LockError should not have been raised")
+
+        with pytest.raises(LockError):
+            async with self.get_lock(
+                r, "foo", timeout=0.1, raise_on_release_error=True
+            ) as lock:
+                lock.release()
+
     async def test_high_sleep_small_blocking_timeout(self, r):
         lock1 = self.get_lock(r, "foo")
         assert await lock1.acquire(blocking=False)

Diff for: tests/test_lock.py

@@ -133,7 +133,7 @@ def test_context_manager_raises_when_locked_not_acquired(self, r):
             with self.get_lock(r, "foo", blocking_timeout=0.1):
                 pass
 
-    def test_context_manager_not_raise_on_release_error(self, r):
+    def test_context_manager_not_raise_on_release_lock_not_owned_error(self, r):
         try:
             with self.get_lock(r, "foo", timeout=0.1, raise_on_release_error=False):
                 time.sleep(0.15)
@@ -144,6 +144,21 @@ def test_context_manager_not_raise_on_release_error(self, r):
             with self.get_lock(r, "foo", timeout=0.1, raise_on_release_error=True):
                 time.sleep(0.15)
 
+    def test_context_manager_not_raise_on_release_lock_error(self, r):
+        try:
+            with self.get_lock(
+                r, "foo", timeout=0.1, raise_on_release_error=False
+            ) as lock:
+                lock.release()
+        except LockError:
+            pytest.fail("LockError should not have been raised")
+
+        with pytest.raises(LockError):
+            with self.get_lock(
+                r, "foo", timeout=0.1, raise_on_release_error=True
+            ) as lock:
+                lock.release()
+
     def test_high_sleep_small_blocking_timeout(self, r):
         lock1 = self.get_lock(r, "foo")
         assert lock1.acquire(blocking=False)