MOD: Modify blocking behavior with no connection

Author: nmacholl

databento/live/client.py

@@ -570,14 +570,19 @@ def block_for_close(
         ------
         BentoError
             If the connection is terminated unexpectedly.
+        ValueError
+            If the client has never connected.
 
         See Also
         --------
         wait_for_close
 
         """
+        if self._connection is None:
+            raise ValueError("cannot block_for_close before connecting")
+
         if not self.is_connected():
-            raise ValueError("cannot wait for close before connecting")
+            return
 
         try:
             asyncio.run_coroutine_threadsafe(
@@ -612,14 +617,19 @@ async def wait_for_close(
         ------
         BentoError
             If the connection is terminated unexpectedly.
+        ValueError
+            If the client has never connected.
 
         See Also
         --------
         block_for_close
 
         """
+        if self._connection is None:
+            raise ValueError("cannot wait_for_close before connecting")
+
         if not self.is_connected():
-            raise ValueError("cannot wait for close before connecting")
+            return
 
         waiter = asyncio.wrap_future(
             asyncio.run_coroutine_threadsafe(

tests/test_live_client.py

@@ -436,6 +436,17 @@ def test_live_block_for_close_timeout(
     live_client.terminate.assert_called_once()  # type: ignore
 
 
+def test_live_block_for_close_dry(
+    live_client: client.Live,
+) -> None:
+    """
+    Test that block_for_close raises a ValueError if the client
+    has never connected.
+    """
+    with pytest.raises(ValueError):
+        live_client.block_for_close()
+
+
 @pytest.mark.asyncio
 @pytest.mark.usefixtures("mock_live_server")
 async def test_live_wait_for_close(
@@ -460,6 +471,18 @@ async def test_live_wait_for_close(
     assert not live_client.is_connected()
 
 
+@pytest.mark.asyncio
+async def test_live_wait_for_close_dry(
+    live_client: client.Live,
+) -> None:
+    """
+    Test that wait_for_close raises a ValueError if the client
+    has never connected.
+    """
+    with pytest.raises(ValueError):
+        await live_client.wait_for_close()
+
+
 @pytest.mark.asyncio
 @pytest.mark.usefixtures("mock_live_server")
 async def test_live_wait_for_close_timeout(