better error handling with hiredis. fully fixes #456

1 files changed, 14 insertions, 15 deletions

diff --git a/tests/test_connection_pool.py b/tests/test_connection_pool.py
index b4b6268..c678b8e 100644
--- a/tests/test_connection_pool.py
+++ b/tests/test_connection_pool.py
@@ -203,18 +203,17 @@ class TestConnection(object):
         assert len(pool._available_connections) == 1
         assert not pool._available_connections[0]._sock
 
-    # TODO: This fails on hiredis. need to think about this
-    # @skip_if_server_version_lt('2.8.8')
-    # def test_busy_loading_from_pipeline(self, r):
-    #     """
-    #     BusyLoadingErrors should be raised from a pipeline execution
-    #     regardless of the raise_on_error flag.
-    #     """
-    #     pipe = r.pipeline()
-    #     pipe.execute_command('DEBUG', 'ERROR', 'LOADING fake message')
-    #     with pytest.raises(redis.BusyLoadingError):
-    #         pipe.execute()
-    #     pool = r.connection_pool
-    #     assert not pipe.connection
-    #     assert len(pool._available_connections) == 1
-    #     assert not pool._available_connections[0]._sock
+    @skip_if_server_version_lt('2.8.8')
+    def test_busy_loading_from_pipeline(self, r):
+        """
+        BusyLoadingErrors should be raised from a pipeline execution
+        regardless of the raise_on_error flag.
+        """
+        pipe = r.pipeline()
+        pipe.execute_command('DEBUG', 'ERROR', 'LOADING fake message')
+        with pytest.raises(redis.BusyLoadingError):
+            pipe.execute()
+        pool = r.connection_pool
+        assert not pipe.connection
+        assert len(pool._available_connections) == 1
+        assert not pool._available_connections[0]._sock