Skip to content

Commit

Permalink
fix verify not sent with request in ResilientSession (#1573) (#1631)
Browse files Browse the repository at this point in the history
Co-authored-by: Jon Grace-Cox <Jon.Grace-Cox@dunnhumby.com>
  • Loading branch information
jongracecox and Jon Grace-Cox committed May 17, 2023
1 parent 7dc637d commit 916fced
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 0 deletions.
3 changes: 3 additions & 0 deletions jira/resilientsession.py
Original file line number Diff line number Diff line change
Expand Up @@ -184,6 +184,9 @@ def _jira_prepare(self, **original_kwargs) -> dict:
# but for people subclassing we should preserve old behaviour
prepared_kwargs["data"] = json.dumps(data)

if "verify" not in prepared_kwargs:
prepared_kwargs["verify"] = self.verify

return prepared_kwargs

def request( # type: ignore[override] # An intentionally different override
Expand Down
15 changes: 15 additions & 0 deletions tests/test_resilientsession.py
Original file line number Diff line number Diff line change
Expand Up @@ -197,3 +197,18 @@ def test_with_requests_tuple_timeout(mocked_request_method: Mock):
session.get(url="mocked_url", data={"some": "fake-data"})
kwargs = mocked_request_method.call_args.kwargs
assert kwargs["data"] == '{"some": "fake-data"}'


@patch("requests.Session.request")
def test_verify_is_forwarded(mocked_request_method: Mock):
# Disable retries for this test.
session = jira.resilientsession.ResilientSession(max_retries=0)

session.get(url="mocked_url", data={"some": "fake-data"})
kwargs = mocked_request_method.call_args.kwargs
assert kwargs["verify"] == session.verify is True

session.verify = False
session.get(url="mocked_url", data={"some": "fake-data"})
kwargs = mocked_request_method.call_args.kwargs
assert kwargs["verify"] == session.verify is False

0 comments on commit 916fced

Please sign in to comment.