added tests for api/proxy timeouts

tests/test_api.py

@@ -1,16 +1,18 @@
 import datetime
 import os
+import pytest
 import shutil
 import tempfile
 import time
 import unittest
 
 import pyotp
 import vcr
+from requests.exceptions import ConnectTimeout, ReadTimeout
 from utils import load_auth
 from utils import save_auth
 
-from sdclientapi import API
+from sdclientapi import API, RequestTimeoutError
 from sdclientapi.sdlocalobjects import AuthError
 from sdclientapi.sdlocalobjects import BaseError
 from sdclientapi.sdlocalobjects import Reply
@@ -318,3 +320,17 @@ def test_delete_reply(self):
 
         # We deleted one, so there must be 1 less reply now
         self.assertEqual(len(self.api.get_all_replies()), number_of_replies_before - 1)
+
+
+def test_request_connect_timeout(mocker):
+    api = API("mock", "mock", "mock", "mock", proxy=False)
+    mocker.patch("sdclientapi.requests.request", side_effect=ConnectTimeout)
+    with pytest.raises(RequestTimeoutError):
+        api.authenticate()
+
+
+def test_request_read_timeout(mocker):
+    api = API("mock", "mock", "mock", "mock", proxy=False)
+    mocker.patch("sdclientapi.requests.request", side_effect=ReadTimeout)
+    with pytest.raises(RequestTimeoutError):
+        api.authenticate()

tests/test_apiproxy.py

@@ -1,12 +1,15 @@
 import datetime
 import os
 import pyotp
+import pytest
 import time
 import shutil
 import tempfile
 import unittest
 
-from sdclientapi import API
+from subprocess import TimeoutExpired
+
+from sdclientapi import API, RequestTimeoutError
 from sdclientapi.sdlocalobjects import (
     BaseError,
     WrongUUIDError,
@@ -304,3 +307,18 @@ def test_delete_reply(self):
 
         # We deleted one, so there must be 1 less reply now
         self.assertEqual(len(self.api.get_all_replies()), number_of_replies_before - 1)
+
+
+def test_request_timeout(mocker):
+    class MockedPopen:
+        def __init__(self, *nargs, **kwargs) -> None:
+            self.stdin = mocker.MagicMock()
+
+        def communicate(self, *nargs, **kwargs) -> None:
+            raise TimeoutExpired(["mock"], 123)
+
+    api = API("mock", "mock", "mock", "mock", proxy=True)
+    mocker.patch("sdclientapi.Popen", MockedPopen)
+
+    with pytest.raises(RequestTimeoutError):
+        api.authenticate()