huskies: merge 987
This commit is contained in:
dave
@@ -237,7 +237,13 @@ async fn merge_agent_work_returns_error_when_branch_not_found() {
|
||||
let job = run_merge_to_completion(&pool, repo, "99_nonexistent").await;
|
||||
match &job.status {
|
||||
MergeJobStatus::Completed(report) => {
|
||||
assert!(!report.success, "should fail when branch missing");
|
||||
assert!(
|
||||
!matches!(
|
||||
report.result,
|
||||
crate::agents::merge::MergeResult::Success { .. }
|
||||
),
|
||||
"should fail when branch missing"
|
||||
);
|
||||
}
|
||||
MergeJobStatus::Failed(_) => {
|
||||
// Also acceptable — the pipeline errored out
|
||||
@@ -305,11 +311,23 @@ async fn merge_agent_work_succeeds_on_clean_branch() {
|
||||
|
||||
match &job.status {
|
||||
MergeJobStatus::Completed(report) => {
|
||||
assert!(!report.had_conflicts, "should have no conflicts");
|
||||
assert!(
|
||||
report.success
|
||||
|| report.gate_output.contains("Failed to run")
|
||||
|| !report.gates_passed,
|
||||
!matches!(
|
||||
report.result,
|
||||
crate::agents::merge::MergeResult::Conflict { .. }
|
||||
),
|
||||
"should have no conflicts"
|
||||
);
|
||||
let is_success = matches!(
|
||||
report.result,
|
||||
crate::agents::merge::MergeResult::Success { .. }
|
||||
);
|
||||
let is_gate_failure = matches!(
|
||||
report.result,
|
||||
crate::agents::merge::MergeResult::GateFailure { .. }
|
||||
);
|
||||
assert!(
|
||||
is_success || is_gate_failure || report.result.output().contains("Failed to run"),
|
||||
"report should be coherent: {report:?}"
|
||||
);
|
||||
if report.story_archived {
|
||||
@@ -418,8 +436,8 @@ fn quality_gates_run_before_fast_forward_to_master() {
|
||||
|
||||
// Gates must have failed (script/test exits 1) so master should be untouched.
|
||||
assert!(
|
||||
!result.success,
|
||||
"run_squash_merge must report failure when gates fail"
|
||||
!matches!(result, crate::agents::merge::MergeResult::Success { .. }),
|
||||
"run_squash_merge must report failure when gates fail; got: {result:?}"
|
||||
);
|
||||
assert_eq!(
|
||||
head_before, head_after,
|
||||
@@ -531,7 +549,13 @@ async fn merge_agent_work_conflict_does_not_break_master() {
|
||||
// The report should accurately reflect what happened.
|
||||
match &job.status {
|
||||
MergeJobStatus::Completed(report) => {
|
||||
assert!(report.had_conflicts, "should report conflicts");
|
||||
assert!(
|
||||
matches!(
|
||||
report.result,
|
||||
crate::agents::merge::MergeResult::Conflict { .. }
|
||||
),
|
||||
"should report conflicts"
|
||||
);
|
||||
}
|
||||
MergeJobStatus::Failed(_) => {
|
||||
// Acceptable — merge aborted due to conflicts
|
||||
@@ -596,17 +620,17 @@ async fn merge_agent_work_zero_commits_ahead_stays_in_merge_stage() {
|
||||
match &job.status {
|
||||
MergeJobStatus::Completed(report) => {
|
||||
assert!(
|
||||
!report.success,
|
||||
"merge must not have succeeded when feature branch is empty"
|
||||
matches!(
|
||||
report.result,
|
||||
crate::agents::merge::MergeResult::NoCommits { .. }
|
||||
),
|
||||
"merge must fail with NoCommits when feature branch is empty; got: {:?}",
|
||||
report.result
|
||||
);
|
||||
assert!(
|
||||
report.no_commits,
|
||||
"report.no_commits must be true for a zero-ahead branch"
|
||||
);
|
||||
assert!(
|
||||
report.gate_output.contains("no commits to merge"),
|
||||
"gate_output must contain 'no commits to merge', got: {}",
|
||||
report.gate_output
|
||||
report.result.output().contains("no commits to merge"),
|
||||
"output must contain 'no commits to merge', got: {}",
|
||||
report.result.output()
|
||||
);
|
||||
}
|
||||
MergeJobStatus::Failed(e) => {
|
||||
@@ -701,10 +725,16 @@ async fn server_side_merge_happy_path_advances_to_done() {
|
||||
match &job.status {
|
||||
MergeJobStatus::Completed(report) => {
|
||||
assert!(
|
||||
!report.had_conflicts,
|
||||
!matches!(
|
||||
report.result,
|
||||
crate::agents::merge::MergeResult::Conflict { .. }
|
||||
),
|
||||
"clean branch should have no conflicts"
|
||||
);
|
||||
if report.success {
|
||||
if matches!(
|
||||
report.result,
|
||||
crate::agents::merge::MergeResult::Success { .. }
|
||||
) {
|
||||
// story_archived may or may not be true depending on gate env,
|
||||
// but merge_failure must NOT be in the content store.
|
||||
let content = crate::db::read_content(crate::db::ContentKey::Story("757a_happy"));
|
||||
@@ -838,7 +868,8 @@ async fn server_side_merge_conflict_sets_merge_failure() {
|
||||
// The merge must fail (conflict).
|
||||
let failed = matches!(
|
||||
&job.status,
|
||||
MergeJobStatus::Completed(r) if !r.success
|
||||
MergeJobStatus::Completed(r)
|
||||
if !matches!(r.result, crate::agents::merge::MergeResult::Success { .. })
|
||||
) || matches!(&job.status, MergeJobStatus::Failed(_));
|
||||
assert!(
|
||||
failed,
|
||||
@@ -953,11 +984,17 @@ async fn server_side_merge_gate_failure_sets_merge_failure() {
|
||||
match &job.status {
|
||||
MergeJobStatus::Completed(report) => {
|
||||
assert!(
|
||||
!report.success,
|
||||
!matches!(
|
||||
report.result,
|
||||
crate::agents::merge::MergeResult::Success { .. }
|
||||
),
|
||||
"gates should have failed; report: {report:?}"
|
||||
);
|
||||
assert!(
|
||||
!report.had_conflicts,
|
||||
!matches!(
|
||||
report.result,
|
||||
crate::agents::merge::MergeResult::Conflict { .. }
|
||||
),
|
||||
"should be a gate failure, not a conflict"
|
||||
);
|
||||
}
|
||||
@@ -1052,11 +1089,18 @@ async fn merge_agent_work_one_commit_ahead_merges_successfully() {
|
||||
MergeJobStatus::Completed(report) => {
|
||||
// Success or gate failure — both acceptable; the key invariant is
|
||||
// that we didn't fail with the zero-commits early-exit.
|
||||
let is_success = matches!(
|
||||
report.result,
|
||||
crate::agents::merge::MergeResult::Success { .. }
|
||||
);
|
||||
let is_gate_failure = matches!(
|
||||
report.result,
|
||||
crate::agents::merge::MergeResult::GateFailure { .. }
|
||||
);
|
||||
assert!(
|
||||
report.success || !report.gates_passed,
|
||||
"unexpected state: success={} gates_passed={}",
|
||||
report.success,
|
||||
report.gates_passed
|
||||
is_success || is_gate_failure,
|
||||
"unexpected result variant: {:?}",
|
||||
report.result
|
||||
);
|
||||
}
|
||||
MergeJobStatus::Running => panic!("should not still be running"),
|
||||
|
||||
Reference in New Issue
Block a user