huskies: merge 1036
This commit is contained in:
@@ -203,6 +203,7 @@ fn block_from_any_active_stage() {
|
||||
commits_ahead: nz(1),
|
||||
claim: None,
|
||||
retries: 0,
|
||||
server_start_time: None,
|
||||
};
|
||||
let result = transition(
|
||||
m,
|
||||
@@ -359,6 +360,7 @@ fn merge_failed_final() {
|
||||
commits_ahead: nz(1),
|
||||
claim: None,
|
||||
retries: 0,
|
||||
server_start_time: None,
|
||||
};
|
||||
let result = transition(
|
||||
s,
|
||||
@@ -462,6 +464,7 @@ fn bug_502_agent_not_in_stage() {
|
||||
commits_ahead: NonZeroU32::new(3).unwrap(),
|
||||
claim: None,
|
||||
retries: 0,
|
||||
server_start_time: None,
|
||||
};
|
||||
// Stage::Merge has exactly two fields: feature_branch and commits_ahead.
|
||||
// There is no way to attach an agent name to it. The type system
|
||||
@@ -552,6 +555,7 @@ fn reject_from_active_stages() {
|
||||
commits_ahead: nz(1),
|
||||
claim: None,
|
||||
retries: 0,
|
||||
server_start_time: None,
|
||||
};
|
||||
let result = transition(
|
||||
m,
|
||||
@@ -945,6 +949,7 @@ fn merge_aborted_returns_to_coding() {
|
||||
commits_ahead: nz(2),
|
||||
claim: None,
|
||||
retries: 0,
|
||||
server_start_time: None,
|
||||
};
|
||||
let result = transition(s, PipelineEvent::MergeAborted).unwrap();
|
||||
assert!(
|
||||
@@ -1056,6 +1061,7 @@ fn hotfix_requested_rejected_from_non_done_stages() {
|
||||
commits_ahead: nz(1),
|
||||
claim: None,
|
||||
retries: 0,
|
||||
server_start_time: None,
|
||||
},
|
||||
] {
|
||||
let result = transition(stage.clone(), PipelineEvent::HotfixRequested);
|
||||
@@ -1101,6 +1107,7 @@ fn audit_entry_is_single_line_with_all_fields() {
|
||||
commits_ahead: nz(3),
|
||||
claim: None,
|
||||
retries: 0,
|
||||
server_start_time: None,
|
||||
},
|
||||
event: PipelineEvent::GatesPassed {
|
||||
feature_branch: fb("feature/story-42"),
|
||||
@@ -1139,6 +1146,7 @@ fn audit_entry_merge_to_done() {
|
||||
commits_ahead: nz(1),
|
||||
claim: None,
|
||||
retries: 0,
|
||||
server_start_time: None,
|
||||
},
|
||||
after: Stage::Done {
|
||||
merged_at: chrono::Utc::now(),
|
||||
@@ -1232,6 +1240,7 @@ fn audit_entry_merge_to_merge_failure() {
|
||||
commits_ahead: nz(1),
|
||||
claim: None,
|
||||
retries: 0,
|
||||
server_start_time: None,
|
||||
},
|
||||
after: Stage::MergeFailure {
|
||||
kind: MergeFailureKind::Other("conflicts".into()),
|
||||
|
||||
Reference in New Issue
Block a user