Expanded Client Timeout Controls (#660)

client/unit-tests/test_client.py

@@ -2,14 +2,27 @@
 
 import pytest
 
-from valor.client import connect, get_connection, reset_connection
+from valor.client import (
+    _format_request_timeout,
+    connect,
+    get_connection,
+    reset_connection,
+)
 from valor.exceptions import (
     ClientAlreadyConnectedError,
     ClientConnectionFailed,
     ClientNotConnectedError,
 )
 
 
+def test__format_request_timeout():
+    assert _format_request_timeout(timeout=None, default=30) == 30
+    assert _format_request_timeout(timeout=60, default=30) == 60
+    assert _format_request_timeout(timeout=-1, default=30) is None
+    assert _format_request_timeout(timeout=0, default=30) is None
+    assert _format_request_timeout(timeout=-0.1, default=30) is None
+
+
 @patch("valor.client.ClientConnection")
 def test_connect(ClientConnection):
     connect(host="host")

client/unit-tests/test_coretypes.py

@@ -0,0 +1,19 @@
+from unittest.mock import patch
+
+import pytest
+
+from valor import Client
+
+
+@patch("time.sleep")
+@patch("valor.Client")
+def test_timeouts(mock_sleep, mock_client):
+
+    with pytest.raises(TimeoutError):
+        Client.delete_dataset(mock_client, name="some_dataset", timeout=1)
+
+    with pytest.raises(TimeoutError):
+        Client.delete_model(mock_client, name="some_dataset", timeout=1)
+
+    with pytest.raises(TimeoutError):
+        Client.delete_evaluation(mock_client, evaluation_id=1, timeout=1)