Bugfix: use proxies from settings (#306)

* fix proxy bug, add tests

* changelog

Author: timabrmsn

CHANGELOG.md

@@ -16,6 +16,10 @@ how a consumer would use the library (e.g. adding unit tests, updating documenta
 
 - `sdk.legalhold.get_all_events()` to search for legal hold events.
 
+### Fixed
+
+- Bug where proxy settings were not being applied correctly.
+
 ## 1.12.0 - 2021-02-25
 
 ### Added

src/py42/services/_connection.py

@@ -188,7 +188,7 @@ def request(
                 timeout=timeout,
                 verify=settings.verify_ssl_certs,
                 cert=cert,
-                proxies=proxies,
+                proxies=proxies or settings.proxies,
             )
 
             if not stream and response is not None:

tests/services/test_connection.py

@@ -4,6 +4,7 @@
 from requests import Response
 from tests.conftest import TEST_DEVICE_GUID
 
+import py42.settings as settings
 from py42.exceptions import Py42DeviceNotConnectedError
 from py42.exceptions import Py42Error
 from py42.exceptions import Py42FeatureUnavailableError
@@ -88,6 +89,13 @@ def mock_not_connected_server_conn(mocker):
     return mock_conn
 
 
+@pytest.fixture
+def proxy_set():
+    settings.proxies = {"https": "http://localhost:9999"}
+    yield
+    settings.proxies = None
+
+
 class MockPreparedRequest(object):
     def __init__(self, method, url, data=None):
         self._method = method
@@ -384,3 +392,20 @@ def test_connection_request_when_not_give_accept_header_sets_accept_to_applicati
         connection.put(URL, data='{"foo":"bar"}')
         request = success_requests_session.prepare_request.call_args[0][0]
         assert request.headers["Accept"] == "application/json"
+
+    def test_connection_request_when_proxies_set_passes_proxies_arg_to_session_send(
+        self, proxy_set, mock_host_resolver, mock_auth, success_requests_session
+    ):
+        connection = Connection(
+            mock_host_resolver, mock_auth, session=success_requests_session
+        )
+        url = "https://example.com"
+        connection.get(url)
+        connection.post(url)
+        connection.options(url)
+        connection.put(url)
+        connection.patch(url)
+        connection.head(url)
+        connection.delete(url)
+        for call in success_requests_session.send.call_args_list:
+            assert call[1]["proxies"] == {"https": "http://localhost:9999"}