Fix garbage collection deadlock (#1578)

1 files changed, 12 insertions, 0 deletions

diff --git a/tests/test_pubsub.py b/tests/test_pubsub.py
index 6a4f0aa..4be6c7a 100644
--- a/tests/test_pubsub.py
+++ b/tests/test_pubsub.py
@@ -570,3 +570,15 @@ class TestPubSubWorkerThread:
         assert event.wait(timeout=1.0)
         pubsub_thread.join(timeout=1.0)
         assert not pubsub_thread.is_alive()
+
+
+class TestPubSubDeadlock:
+    @pytest.mark.timeout(30, method='thread')
+    def test_pubsub_deadlock(self, master_host):
+        pool = redis.ConnectionPool(host=master_host)
+        r = redis.Redis(connection_pool=pool)
+
+        for i in range(60):
+            p = r.pubsub()
+            p.subscribe("my-channel-1", "my-channel-2")
+            pool.reset()