mirror of
https://github.com/Sea-Haven-Industries/open-swe.git
synced 2026-10-02 15:33:16 +00:00
Adam Moussa
ae1f883b4c
Applies the plan's C5 step: git mv every test per the domain-reorg
move-map (movemap-m50.txt) into tests/{agent,analyzer,auth,dashboard,
github,middleware,models,reviewer,sandbox,slack,tools,webhooks}/, plus
the 13 fork-only placements from the scoping report §2c (Atlassian
webhook tests -> tests/webhooks/, test_atlassian_connect.py and
test_auth_error_leak.py -> tests/auth/, jira/confluence util tests ->
tests/tools/, test_repo_binding_isolation.py -> tests/sandbox/,
bot-identity/autofix tests -> tests/github/).
Path-only move: the only content edits are parents[1] -> parents[2]
fixes in test_e2b_integration.py and test_daytona_integration.py,
required because their __file__-relative ROOT path gained one more
directory level in the move.
Monkeypatch retargets for these files were already completed in C4;
none remained outstanding here.
297 lines
9.6 KiB
Python
297 lines
9.6 KiB
Python
from __future__ import annotations
|
|
|
|
from unittest.mock import AsyncMock, patch
|
|
|
|
import pytest
|
|
|
|
from agent.review.reconcile import reconcile_findings_with_review_threads
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_reconcile_marks_resolved_github_thread_resolved() -> None:
|
|
findings = [
|
|
{
|
|
"id": "f1",
|
|
"status": "open",
|
|
"github_review_comment_id": 11,
|
|
"github_review_thread_id": "THREAD_1",
|
|
}
|
|
]
|
|
replace = AsyncMock()
|
|
|
|
with (
|
|
patch("agent.review.reconcile.list_findings", AsyncMock(return_value=findings)),
|
|
patch("agent.review.reconcile.replace_findings", replace),
|
|
):
|
|
result = await reconcile_findings_with_review_threads(
|
|
"tid",
|
|
[
|
|
{
|
|
"id": "THREAD_1",
|
|
"is_resolved": True,
|
|
"is_outdated": False,
|
|
"comments": [{"id": 11, "author": "open-swe[bot]", "body": "bug"}],
|
|
}
|
|
],
|
|
)
|
|
|
|
assert result[0]["status"] == "resolved"
|
|
assert result[0]["github_thread_resolved"] is True
|
|
replace.assert_awaited_once()
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_reconcile_backfills_comment_and_thread_ids_from_bot_marker() -> None:
|
|
findings = [
|
|
{
|
|
"id": "f1",
|
|
"status": "open",
|
|
"github_review_comment_id": None,
|
|
"github_review_thread_id": None,
|
|
}
|
|
]
|
|
replace = AsyncMock()
|
|
|
|
with (
|
|
patch("agent.review.reconcile.list_findings", AsyncMock(return_value=findings)),
|
|
patch("agent.review.reconcile.replace_findings", replace),
|
|
):
|
|
result = await reconcile_findings_with_review_threads(
|
|
"tid",
|
|
[
|
|
{
|
|
"id": "THREAD_1",
|
|
"is_resolved": False,
|
|
"is_outdated": False,
|
|
"comments": [
|
|
{
|
|
"id": 11,
|
|
"author": "open-swe[bot]",
|
|
"body": (
|
|
'<!-- open-swe-review-comment {"id":"f1",'
|
|
'"file_path":"a.py","start_line":1,'
|
|
'"end_line":1,"side":"RIGHT"} -->\n\nbug'
|
|
),
|
|
}
|
|
],
|
|
}
|
|
],
|
|
)
|
|
|
|
assert result[0]["github_review_comment_id"] == 11
|
|
assert result[0]["github_review_comment_ids"] == [11]
|
|
assert result[0]["github_review_thread_id"] == "THREAD_1"
|
|
assert result[0]["github_review_thread_ids"] == ["THREAD_1"]
|
|
replace.assert_awaited_once()
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_reconcile_backfills_marker_from_graphql_app_login() -> None:
|
|
findings = [
|
|
{
|
|
"id": "f1",
|
|
"status": "open",
|
|
"github_review_comment_id": None,
|
|
"github_review_thread_id": None,
|
|
}
|
|
]
|
|
replace = AsyncMock()
|
|
|
|
with (
|
|
patch("agent.review.reconcile.list_findings", AsyncMock(return_value=findings)),
|
|
patch("agent.review.reconcile.replace_findings", replace),
|
|
):
|
|
result = await reconcile_findings_with_review_threads(
|
|
"tid",
|
|
[
|
|
{
|
|
"id": "THREAD_1",
|
|
"is_resolved": False,
|
|
"is_outdated": False,
|
|
"comments": [
|
|
{
|
|
"id": 11,
|
|
"author": "open-swe",
|
|
"body": (
|
|
'<!-- open-swe-review-comment {"id":"f1",'
|
|
'"file_path":"a.py","start_line":1,'
|
|
'"end_line":1,"side":"RIGHT"} -->\n\nbug'
|
|
),
|
|
}
|
|
],
|
|
}
|
|
],
|
|
)
|
|
|
|
assert result[0]["github_review_comment_id"] == 11
|
|
assert result[0]["github_review_thread_id"] == "THREAD_1"
|
|
replace.assert_awaited_once()
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_reconcile_duplicate_markers_require_all_threads_terminal() -> None:
|
|
findings = [
|
|
{
|
|
"id": "f1",
|
|
"status": "open",
|
|
"github_review_comment_id": None,
|
|
"github_review_thread_id": None,
|
|
}
|
|
]
|
|
replace = AsyncMock()
|
|
marker = (
|
|
'<!-- open-swe-review-comment {"id":"f1",'
|
|
'"file_path":"a.py","start_line":1,'
|
|
'"end_line":1,"side":"RIGHT"} -->\n\nbug'
|
|
)
|
|
|
|
with (
|
|
patch("agent.review.reconcile.list_findings", AsyncMock(return_value=findings)),
|
|
patch("agent.review.reconcile.replace_findings", replace),
|
|
):
|
|
result = await reconcile_findings_with_review_threads(
|
|
"tid",
|
|
[
|
|
{
|
|
"id": "THREAD_OLD",
|
|
"is_resolved": False,
|
|
"is_outdated": True,
|
|
"comments": [{"id": 11, "author": "open-swe[bot]", "body": marker}],
|
|
},
|
|
{
|
|
"id": "THREAD_OPEN",
|
|
"is_resolved": False,
|
|
"is_outdated": False,
|
|
"comments": [{"id": 12, "author": "open-swe[bot]", "body": marker}],
|
|
},
|
|
],
|
|
)
|
|
|
|
assert result[0]["status"] == "open"
|
|
assert result[0]["github_review_comment_ids"] == [11, 12]
|
|
assert result[0]["github_review_thread_ids"] == ["THREAD_OLD", "THREAD_OPEN"]
|
|
replace.assert_awaited_once()
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_reconcile_duplicate_markers_stay_open_when_some_threads_only_outdated() -> None:
|
|
findings = [
|
|
{
|
|
"id": "f1",
|
|
"status": "open",
|
|
"github_review_comment_id": None,
|
|
"github_review_thread_id": None,
|
|
}
|
|
]
|
|
replace = AsyncMock()
|
|
marker = (
|
|
'<!-- open-swe-review-comment {"id":"f1",'
|
|
'"file_path":"a.py","start_line":1,'
|
|
'"end_line":1,"side":"RIGHT"} -->\n\nbug'
|
|
)
|
|
|
|
with (
|
|
patch("agent.review.reconcile.list_findings", AsyncMock(return_value=findings)),
|
|
patch("agent.review.reconcile.replace_findings", replace),
|
|
):
|
|
result = await reconcile_findings_with_review_threads(
|
|
"tid",
|
|
[
|
|
{
|
|
"id": "THREAD_OLD",
|
|
"is_resolved": False,
|
|
"is_outdated": True,
|
|
"comments": [{"id": 11, "author": "open-swe[bot]", "body": marker}],
|
|
},
|
|
{
|
|
"id": "THREAD_RESOLVED",
|
|
"is_resolved": True,
|
|
"is_outdated": False,
|
|
"comments": [{"id": 12, "author": "open-swe[bot]", "body": marker}],
|
|
},
|
|
],
|
|
)
|
|
|
|
assert result[0]["status"] == "open"
|
|
assert "last_reconciliation_note" not in result[0]
|
|
assert result[0]["github_resolved_thread_ids"] == ["THREAD_RESOLVED"]
|
|
assert result[0].get("github_thread_resolved") is not True
|
|
replace.assert_awaited_once()
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_reconcile_ignores_spoofed_non_bot_marker() -> None:
|
|
findings = [
|
|
{
|
|
"id": "f1",
|
|
"status": "open",
|
|
"github_review_comment_id": None,
|
|
"github_review_thread_id": None,
|
|
}
|
|
]
|
|
replace = AsyncMock()
|
|
|
|
with (
|
|
patch("agent.review.reconcile.list_findings", AsyncMock(return_value=findings)),
|
|
patch("agent.review.reconcile.replace_findings", replace),
|
|
):
|
|
result = await reconcile_findings_with_review_threads(
|
|
"tid",
|
|
[
|
|
{
|
|
"id": "THREAD_1",
|
|
"is_resolved": False,
|
|
"is_outdated": False,
|
|
"comments": [
|
|
{
|
|
"id": 11,
|
|
"author": "human",
|
|
"body": (
|
|
'<!-- open-swe-review-comment {"id":"f1",'
|
|
'"file_path":"a.py","start_line":1,'
|
|
'"end_line":1,"side":"RIGHT"} -->\n\nspoof'
|
|
),
|
|
}
|
|
],
|
|
}
|
|
],
|
|
)
|
|
|
|
assert result[0]["github_review_comment_id"] is None
|
|
assert result[0]["github_review_thread_id"] is None
|
|
replace.assert_not_awaited()
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_reconcile_records_latest_human_reply_after_bot_comment() -> None:
|
|
findings = [{"id": "f1", "status": "open", "github_review_comment_id": 11}]
|
|
replace = AsyncMock()
|
|
|
|
with (
|
|
patch("agent.review.reconcile.list_findings", AsyncMock(return_value=findings)),
|
|
patch("agent.review.reconcile.replace_findings", replace),
|
|
):
|
|
result = await reconcile_findings_with_review_threads(
|
|
"tid",
|
|
[
|
|
{
|
|
"id": "THREAD_1",
|
|
"is_resolved": False,
|
|
"is_outdated": False,
|
|
"comments": [
|
|
{"id": 11, "author": "open-swe[bot]", "body": "bug"},
|
|
{
|
|
"id": 12,
|
|
"author": "human",
|
|
"body": "This is not valid because the caller already guards it.",
|
|
"created_at": "2026-05-26T10:00:00Z",
|
|
},
|
|
],
|
|
}
|
|
],
|
|
)
|
|
|
|
assert result[0]["github_review_thread_id"] == "THREAD_1"
|
|
assert result[0]["last_human_reply_author"] == "human"
|
|
assert "not valid" in result[0]["last_human_reply_body"]
|
|
replace.assert_awaited_once()
|