Actually set the timeout in timeout test cases

Author: ncoghlan

src/lmstudio/json_api.py

@@ -695,6 +695,7 @@ def is_finished(self) -> bool:
     def _set_result(self, result: T) -> ChannelFinishedEvent:
         # Note: errors are raised immediately when handling the relevant message
         #       rather than only being reported when the result is accessed
+        self._logger.debug("Channel result received, closing channel")
         self._is_finished = True
         self._result = result
         return ChannelFinishedEvent(None)

tests/test_timeouts.py

@@ -14,6 +14,7 @@
     get_sync_api_timeout,
     set_sync_api_timeout,
 )
+from lmstudio.sync_api import _DEFAULT_TIMEOUT
 
 from .support import EXPECTED_LLM_ID
 
@@ -22,40 +23,51 @@
 
 @contextmanager
 def sync_api_timeout(timeout: float | None) -> Generator[float | None, None, None]:
-    default_timeout = get_sync_api_timeout()
+    previous_timeout = get_sync_api_timeout()
+    set_sync_api_timeout(timeout)
     try:
-        yield default_timeout
+        yield previous_timeout
     finally:
-        set_sync_api_timeout(default_timeout)
+        set_sync_api_timeout(previous_timeout)
+
+
+def test_default_timeout() -> None:
+    # Ensure default timeout is defined, but is not excessively short or long
+    # (the bounds that are considered reasonable may change over time)
+    assert _DEFAULT_TIMEOUT is not None
+    assert _DEFAULT_TIMEOUT >= 60
+    assert _DEFAULT_TIMEOUT <= 600
 
 
 @pytest.mark.parametrize("timeout", (None, 0, 1.5, 3600, 3600 * 24 * 7))
 def test_timeout_updates_sync(timeout: float | None) -> None:
     with sync_api_timeout(timeout) as previous_timeout:
-        assert previous_timeout is not None
-        assert previous_timeout > 0
-        set_sync_api_timeout(timeout)
+        assert previous_timeout == _DEFAULT_TIMEOUT
         assert get_sync_api_timeout() == timeout
     assert get_sync_api_timeout() == previous_timeout
 
 
 @pytest.mark.lmstudio
-def test_rpc_timeout_sync(caplog: LogCap) -> None:
+def test_timeout_rpc_sync(caplog: LogCap) -> None:
     caplog.set_level(logging.DEBUG)
 
     with Client() as client:
         model = client.llm.model(EXPECTED_LLM_ID)
         with sync_api_timeout(0):
+            assert get_sync_api_timeout() == 0
             with pytest.raises(LMStudioTimeoutError):
-                model.get_info()
+                response = model.get_info()
+                logging.error(f"Unexpected response: {response}")
 
 
 @pytest.mark.lmstudio
-def test_channel_timeout_sync(caplog: LogCap) -> None:
+def test_timeout_channel_sync(caplog: LogCap) -> None:
     caplog.set_level(logging.DEBUG)
 
     with Client() as client:
         model = client.llm.model(EXPECTED_LLM_ID)
         with sync_api_timeout(0):
+            assert get_sync_api_timeout() == 0
             with pytest.raises(LMStudioTimeoutError):
-                model.respond("This will time out")
+                response = model.respond("This will time out")
+                logging.error(f"Unexpected response: {response}")