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
4 changes: 3 additions & 1 deletion pr_agent/git_providers/azuredevops_provider.py
Original file line number Diff line number Diff line change
Expand Up @@ -351,7 +351,9 @@ def publish_comment(self, pr_comment: str, is_temporary: bool = False, thread_co
get_logger().debug(f"Skipping publish_comment for temporary comment: {pr_comment}")
return None
comment = Comment(content=pr_comment)
thread = CommentThread(comments=[comment], thread_context=thread_context, status="closed")

status = get_settings().azure_devops.get("default_comment_status", "closed")
thread = CommentThread(comments=[comment], thread_context=thread_context, status=status)
thread_response = self.azure_devops_client.create_thread(
comment_thread=thread,
project=self.workspace_slug,
Expand Down
2 changes: 2 additions & 0 deletions pr_agent/settings/configuration.toml
Original file line number Diff line number Diff line change
Expand Up @@ -373,6 +373,8 @@ extra_instructions = "" # public - extra instructions to the auto best practices
content = ""
max_patterns = 5 # max number of patterns to be detected

[azure_devops]
default_comment_status = "closed"

[azure_devops_server]
pr_commands = [
Expand Down
59 changes: 59 additions & 0 deletions tests/unittest/test_azure_devops_comment.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
import unittest
from pr_agent.config_loader import get_settings
from unittest.mock import patch, MagicMock
from pr_agent.git_providers import AzureDevopsProvider

class TestAzureDevopsProviderPublishComment(unittest.TestCase):
@patch("pr_agent.git_providers.azuredevops_provider.get_settings")
def test_publish_comment_default_closed(self, mock_get_settings):
# Simulate config with no default_comment_status
mock_settings = MagicMock()
mock_settings.azure_devops.default_comment_status = None
mock_settings.config.publish_output_progress = True
mock_get_settings.return_value = mock_settings

with patch.object(AzureDevopsProvider, "_get_azure_devops_client", return_value=(MagicMock(), MagicMock())):
provider = AzureDevopsProvider()
provider.workspace_slug = "ws"
provider.repo_slug = "repo"
provider.pr_num = 1

# Patch CommentThread and create_thread
with patch("pr_agent.git_providers.azuredevops_provider.CommentThread") as MockThread:
provider.azure_devops_client.create_thread.return_value.comments = [MagicMock()]
provider.azure_devops_client.create_thread.return_value.comments[0].thread_id = 123
provider.azure_devops_client.create_thread.return_value.id = 123

provider.publish_comment("test comment")
args, kwargs = MockThread.call_args
assert kwargs.get("status") == "closed"

@patch("pr_agent.git_providers.azuredevops_provider.get_settings")
def test_publish_comment_active(self, mock_get_settings):
# Simulate config with default_comment_status = "active"
mock_settings = MagicMock()
mock_settings.azure_devops.default_comment_status = "active"
mock_settings.config.publish_output_progress = True
mock_get_settings.return_value = mock_settings

with patch.object(AzureDevopsProvider, "_get_azure_devops_client", return_value=(MagicMock(), MagicMock())):
provider = AzureDevopsProvider()
provider.workspace_slug = "ws"
provider.repo_slug = "repo"
provider.pr_num = 1

# Patch CommentThread and create_thread
with patch("pr_agent.git_providers.azuredevops_provider.CommentThread") as MockThread:
provider.azure_devops_client.create_thread.return_value.comments = [MagicMock()]
provider.azure_devops_client.create_thread.return_value.comments[0].thread_id = 123
provider.azure_devops_client.create_thread.return_value.id = 123

provider.publish_comment("test comment")
args, kwargs = MockThread.call_args
assert kwargs.get("status") == "active"

def test_default_comment_status_from_config_file(self):
# Import get_settings directly to read from configuration.toml
status = get_settings().azure_devops.default_comment_status
# The expected value should match what's in your configuration.toml
self.assertEqual(status, "closed")