Skip to content

Commit f7fb7bd

Browse files
Preserve client.session.verify when set by user (#353)
1 parent fdcc03f commit f7fb7bd

2 files changed

Lines changed: 26 additions & 1 deletion

File tree

linode_api4/linode_client.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,10 @@ def _api_call(
276276
body = json.dumps(data)
277277

278278
response = method(
279-
url, headers=headers, data=body, verify=self.ca_path or True
279+
url,
280+
headers=headers,
281+
data=body,
282+
verify=self.ca_path or self.session.verify,
280283
)
281284

282285
warning = response.headers.get("Warning", None)

test/unit/linode_client_test.py

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -280,6 +280,28 @@ def get_mock(*params, verify=True, **kwargs):
280280

281281
assert called
282282

283+
def test_custom_verify(self):
284+
"""
285+
If we set a custom `verify` value on our session,
286+
we want it preserved.
287+
"""
288+
called = False
289+
290+
self.client.session.verify = False
291+
old_get = self.client.session.get
292+
293+
def get_mock(*params, verify=True, **kwargs):
294+
nonlocal called
295+
called = True
296+
assert verify is False
297+
return old_get(*params, **kwargs)
298+
299+
self.client.session.get = get_mock
300+
301+
self.client.linode.instances()
302+
303+
assert called
304+
283305

284306
class AccountGroupTest(ClientBaseCase):
285307
"""

0 commit comments

Comments
 (0)