ebeb045c51
* [+] Conflict resolution * [F] Fix conflict resolution branches being synched
221 lines
6.9 KiB
Rust
221 lines
6.9 KiB
Rust
use super::*;
|
|
|
|
#[test]
|
|
fn failure_state_persists_repo_failures_by_group() {
|
|
let temp = tempfile::TempDir::new().unwrap();
|
|
let failures = vec![
|
|
SyncFailure::repo(
|
|
"sync-1".to_string(),
|
|
"repo-a".to_string(),
|
|
anyhow::anyhow!("a"),
|
|
),
|
|
SyncFailure::repo(
|
|
"sync-1".to_string(),
|
|
"repo-a".to_string(),
|
|
anyhow::anyhow!("a again"),
|
|
),
|
|
SyncFailure::repo(
|
|
"sync-2".to_string(),
|
|
"repo-b".to_string(),
|
|
anyhow::anyhow!("b"),
|
|
),
|
|
SyncFailure::group(
|
|
"mirror group sync-3".to_string(),
|
|
anyhow::anyhow!("list failed"),
|
|
),
|
|
];
|
|
let state = FailureState::from_failures(&failures);
|
|
|
|
save_failure_state(temp.path(), &state).unwrap();
|
|
let loaded = load_failure_state(temp.path()).unwrap();
|
|
let by_group = loaded.repos_by_group();
|
|
|
|
assert_eq!(by_group["sync-1"].len(), 1);
|
|
assert!(by_group["sync-1"].contains("repo-a"));
|
|
assert_eq!(by_group["sync-2"].len(), 1);
|
|
assert!(by_group["sync-2"].contains("repo-b"));
|
|
assert!(!by_group.contains_key("sync-3"));
|
|
}
|
|
|
|
#[test]
|
|
fn empty_failure_state_removes_retry_file() {
|
|
let temp = tempfile::TempDir::new().unwrap();
|
|
let state = FailureState {
|
|
repos: vec![FailedRepo {
|
|
group: "sync-1".to_string(),
|
|
repo: "repo-a".to_string(),
|
|
}],
|
|
};
|
|
save_failure_state(temp.path(), &state).unwrap();
|
|
assert!(failure_state_path(temp.path()).exists());
|
|
|
|
save_failure_state(temp.path(), &FailureState::default()).unwrap();
|
|
|
|
assert!(!failure_state_path(temp.path()).exists());
|
|
}
|
|
|
|
#[test]
|
|
fn ref_state_persists_and_requires_exact_remote_ref_match() {
|
|
let temp = tempfile::TempDir::new().unwrap();
|
|
let mut refs = BTreeMap::new();
|
|
refs.insert(
|
|
"github_alice".to_string(),
|
|
remote_ref_state("abc", &[("main", "111")]),
|
|
);
|
|
refs.insert(
|
|
"gitea_alice".to_string(),
|
|
remote_ref_state("def", &[("main", "111")]),
|
|
);
|
|
let mut state = RefState::default();
|
|
state.set_repo("sync-1", "repo-a", refs.clone());
|
|
|
|
save_ref_state(temp.path(), &state).unwrap();
|
|
let loaded = load_ref_state(temp.path()).unwrap();
|
|
|
|
assert!(loaded.repo_matches("sync-1", "repo-a", &refs));
|
|
|
|
let mut changed_hash = refs.clone();
|
|
changed_hash.insert(
|
|
"github_alice".to_string(),
|
|
remote_ref_state("changed", &[("main", "111")]),
|
|
);
|
|
assert!(!loaded.repo_matches("sync-1", "repo-a", &changed_hash));
|
|
|
|
let mut missing_remote = refs;
|
|
missing_remote.remove("gitea_alice");
|
|
assert!(!loaded.repo_matches("sync-1", "repo-a", &missing_remote));
|
|
}
|
|
|
|
#[test]
|
|
fn branch_deletion_decisions_propagate_previous_synced_branch_deletion() {
|
|
let remotes = test_remotes();
|
|
let mut previous = BTreeMap::new();
|
|
previous.insert(
|
|
"github".to_string(),
|
|
remote_ref_state("a", &[("main", "111")]),
|
|
);
|
|
previous.insert(
|
|
"gitea".to_string(),
|
|
remote_ref_state("b", &[("main", "111")]),
|
|
);
|
|
let mut current = BTreeMap::new();
|
|
current.insert("github".to_string(), remote_ref_state("c", &[]));
|
|
current.insert(
|
|
"gitea".to_string(),
|
|
remote_ref_state("d", &[("main", "111")]),
|
|
);
|
|
|
|
let (deletions, conflicts, blocked) =
|
|
branch_deletion_decisions(&remotes, Some(&previous), ¤t);
|
|
|
|
assert!(conflicts.is_empty());
|
|
assert!(blocked.contains("main"));
|
|
assert_eq!(deletions.len(), 1);
|
|
assert_eq!(deletions[0].branch, "main");
|
|
assert_eq!(deletions[0].deleted_remotes, vec!["github".to_string()]);
|
|
assert_eq!(deletions[0].target_remotes, vec!["gitea".to_string()]);
|
|
}
|
|
|
|
#[test]
|
|
fn branch_deletion_decisions_conflict_when_branch_changed_elsewhere() {
|
|
let remotes = test_remotes();
|
|
let mut previous = BTreeMap::new();
|
|
previous.insert(
|
|
"github".to_string(),
|
|
remote_ref_state("a", &[("main", "111")]),
|
|
);
|
|
previous.insert(
|
|
"gitea".to_string(),
|
|
remote_ref_state("b", &[("main", "111")]),
|
|
);
|
|
let mut current = BTreeMap::new();
|
|
current.insert("github".to_string(), remote_ref_state("c", &[]));
|
|
current.insert(
|
|
"gitea".to_string(),
|
|
remote_ref_state("d", &[("main", "222")]),
|
|
);
|
|
|
|
let (deletions, conflicts, blocked) =
|
|
branch_deletion_decisions(&remotes, Some(&previous), ¤t);
|
|
|
|
assert!(deletions.is_empty());
|
|
assert!(blocked.contains("main"));
|
|
assert_eq!(conflicts.len(), 1);
|
|
assert_eq!(conflicts[0].branch, "main");
|
|
assert_eq!(conflicts[0].deleted_remotes, vec!["github".to_string()]);
|
|
assert_eq!(conflicts[0].changed_remotes, vec!["gitea".to_string()]);
|
|
}
|
|
|
|
#[test]
|
|
fn branch_deletion_decisions_ignore_internal_conflict_branches() {
|
|
let remotes = test_remotes();
|
|
let conflict_branch = conflict_pr_branch("main", "gitea", "abc123");
|
|
let mut previous = BTreeMap::new();
|
|
previous.insert(
|
|
"github".to_string(),
|
|
remote_ref_state("a", &[(conflict_branch.as_str(), "111")]),
|
|
);
|
|
previous.insert(
|
|
"gitea".to_string(),
|
|
remote_ref_state("b", &[(conflict_branch.as_str(), "111")]),
|
|
);
|
|
let mut current = BTreeMap::new();
|
|
current.insert("github".to_string(), remote_ref_state("c", &[]));
|
|
current.insert(
|
|
"gitea".to_string(),
|
|
remote_ref_state("d", &[(conflict_branch.as_str(), "111")]),
|
|
);
|
|
|
|
let (deletions, conflicts, blocked) =
|
|
branch_deletion_decisions(&remotes, Some(&previous), ¤t);
|
|
|
|
assert!(deletions.is_empty());
|
|
assert!(conflicts.is_empty());
|
|
assert!(blocked.is_empty());
|
|
}
|
|
|
|
#[test]
|
|
fn conflict_branch_prefixes_are_reversible_not_slug_collisions() {
|
|
let slash_branch = conflict_pr_branch_prefix("release/foo");
|
|
let dash_branch = conflict_pr_branch_prefix("release-foo");
|
|
|
|
assert_ne!(slash_branch, dash_branch);
|
|
assert!(slash_branch.starts_with(CONFLICT_BRANCH_ROOT));
|
|
assert!(dash_branch.starts_with(CONFLICT_BRANCH_ROOT));
|
|
assert_eq!(
|
|
conflict_pr_base_branch(&format!("{slash_branch}from-gitea-abc123")),
|
|
Some("release/foo".to_string())
|
|
);
|
|
assert_eq!(
|
|
conflict_pr_base_branch(&format!("{dash_branch}from-gitea-abc123")),
|
|
Some("release-foo".to_string())
|
|
);
|
|
}
|
|
|
|
fn remote_ref_state(hash: &str, branches: &[(&str, &str)]) -> RemoteRefState {
|
|
RemoteRefState {
|
|
hash: hash.to_string(),
|
|
refs: branches.len(),
|
|
branches: branches
|
|
.iter()
|
|
.map(|(branch, sha)| ((*branch).to_string(), (*sha).to_string()))
|
|
.collect(),
|
|
tags: BTreeMap::new(),
|
|
}
|
|
}
|
|
|
|
fn test_remotes() -> Vec<RemoteSpec> {
|
|
vec![
|
|
RemoteSpec {
|
|
name: "github".to_string(),
|
|
url: "https://github.invalid/alice/repo.git".to_string(),
|
|
display: "github:alice:User".to_string(),
|
|
},
|
|
RemoteSpec {
|
|
name: "gitea".to_string(),
|
|
url: "https://gitea.invalid/alice/repo.git".to_string(),
|
|
display: "gitea:alice:User".to_string(),
|
|
},
|
|
]
|
|
}
|