Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion sync2jira/downstream_issue.py
Original file line number Diff line number Diff line change
Expand Up @@ -293,7 +293,7 @@ def get_jira_client(issue, config):

client_kwargs = build_jira_client_kwargs(config["sync2jira"]["jira"][jira_instance])
client = jira.client.JIRA(**client_kwargs)
client.session() # This raises an exception if authentication was not successful
client.server_info() # This raises an exception if authentication was not successful
return client


Expand Down
8 changes: 4 additions & 4 deletions tests/test_downstream_issue.py
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ def test_get_jira_client(self, mock_client):
mock_issue = MagicMock(spec=Issue)
mock_issue.downstream = {"jira_instance": "mock_jira_instance"}
mock_jira_instance = MagicMock()
mock_jira_instance.session.return_value = None
mock_jira_instance.server_info.return_value = None
mock_client.return_value = mock_jira_instance

# Call the function
Expand All @@ -169,7 +169,7 @@ def test_get_jira_client(self, mock_client):
mock_client.assert_called_with(
basic_auth=("email", "token"), options={"server": "mock_server"}
)
mock_jira_instance.session.assert_called_once()
mock_jira_instance.server_info.assert_called_once()
self.assertEqual(mock_jira_instance, response)

@mock.patch("jira.client.JIRA")
Expand All @@ -181,7 +181,7 @@ def test_get_jira_client_auth_failure(self, mock_client):
mock_issue = MagicMock(spec=Issue)
mock_issue.downstream = {"jira_instance": "mock_jira_instance"}
mock_jira_instance = MagicMock()
mock_jira_instance.session.side_effect = JIRAError("Authentication failed")
mock_jira_instance.server_info.side_effect = JIRAError("Authentication failed")
mock_client.return_value = mock_jira_instance

# Call the function and expect it to raise JIRAError
Expand All @@ -192,7 +192,7 @@ def test_get_jira_client_auth_failure(self, mock_client):
mock_client.assert_called_with(
basic_auth=("email", "token"), options={"server": "mock_server"}
)
mock_jira_instance.session.assert_called_once()
mock_jira_instance.server_info.assert_called_once()

@mock.patch("jira.client.JIRA")
def test_get_existing_legacy(self, client):
Expand Down