diff options
Diffstat (limited to 'tests/git_remote_nostr/push.rs')
| -rw-r--r-- | tests/git_remote_nostr/push.rs | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/tests/git_remote_nostr/push.rs b/tests/git_remote_nostr/push.rs index 4dc2c1d..2e9642f 100644 --- a/tests/git_remote_nostr/push.rs +++ b/tests/git_remote_nostr/push.rs | |||
| @@ -896,7 +896,6 @@ async fn pushes_to_all_git_servers_listed_and_ok_printed() -> Result<()> { | |||
| 896 | #[serial] | 896 | #[serial] |
| 897 | async fn proposal_three_way_merge_commit_pushed_to_main_leads_to_status_event_issued() -> Result<()> | 897 | async fn proposal_three_way_merge_commit_pushed_to_main_leads_to_status_event_issued() -> Result<()> |
| 898 | { | 898 | { |
| 899 | // | ||
| 900 | let (events, source_git_repo) = prep_source_repo_and_events_including_proposals().await?; | 899 | let (events, source_git_repo) = prep_source_repo_and_events_including_proposals().await?; |
| 901 | let source_path = source_git_repo.dir.to_str().unwrap().to_string(); | 900 | let source_path = source_git_repo.dir.to_str().unwrap().to_string(); |
| 902 | 901 | ||
| @@ -1164,7 +1163,7 @@ async fn proposal_fast_forward_merge_commits_pushed_to_main_leads_to_status_even | |||
| 1164 | // println!("merge status"); | 1163 | // println!("merge status"); |
| 1165 | // println!("{:?}", merge_status); | 1164 | // println!("{:?}", merge_status); |
| 1166 | 1165 | ||
| 1167 | let patch_commit_ids = proposal_patches | 1166 | let patch_commit_ids_parents_first = proposal_patches |
| 1168 | .iter() | 1167 | .iter() |
| 1169 | .map(|e| { | 1168 | .map(|e| { |
| 1170 | e.tags | 1169 | e.tags |
| @@ -1176,7 +1175,11 @@ async fn proposal_fast_forward_merge_commits_pushed_to_main_leads_to_status_even | |||
| 1176 | }) | 1175 | }) |
| 1177 | .collect::<Vec<String>>(); | 1176 | .collect::<Vec<String>>(); |
| 1178 | assert_eq!( | 1177 | assert_eq!( |
| 1179 | [vec!["merge-commit-id".to_string()], patch_commit_ids].concat(), | 1178 | [ |
| 1179 | vec!["merge-commit-id".to_string()], | ||
| 1180 | patch_commit_ids_parents_first | ||
| 1181 | ] | ||
| 1182 | .concat(), | ||
| 1180 | merge_status | 1183 | merge_status |
| 1181 | .tags | 1184 | .tags |
| 1182 | .iter() | 1185 | .iter() |