diff options
Diffstat (limited to 'tests/git_remote_nostr/push.rs')
| -rw-r--r-- | tests/git_remote_nostr/push.rs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/git_remote_nostr/push.rs b/tests/git_remote_nostr/push.rs index f46b0ea..9f5f492 100644 --- a/tests/git_remote_nostr/push.rs +++ b/tests/git_remote_nostr/push.rs | |||
| @@ -981,7 +981,7 @@ async fn proposal_three_way_merge_commit_pushed_to_main_leads_to_status_event_is | |||
| 981 | 981 | ||
| 982 | let mut p = CliTester::new_git_with_remote_helper_from_dir(&git_repo.dir, ["push"]); | 982 | let mut p = CliTester::new_git_with_remote_helper_from_dir(&git_repo.dir, ["push"]); |
| 983 | cli_expect_nostr_fetch(&mut p)?; | 983 | cli_expect_nostr_fetch(&mut p)?; |
| 984 | p.expect(format!("fetching {} ref list over filesystem...\r\n", source_path).as_str())?; | 984 | p.expect(format!("fetching {source_path} ref list over filesystem...\r\n").as_str())?; |
| 985 | p.expect("list: connecting...\r\n")?; | 985 | p.expect("list: connecting...\r\n")?; |
| 986 | p.expect_eventually("merge commit ")?; | 986 | p.expect_eventually("merge commit ")?; |
| 987 | // shorthand merge commit id appears in this gap | 987 | // shorthand merge commit id appears in this gap |
| @@ -1137,7 +1137,7 @@ async fn proposal_fast_forward_merge_commits_pushed_to_main_leads_to_status_even | |||
| 1137 | 1137 | ||
| 1138 | let mut p = CliTester::new_git_with_remote_helper_from_dir(&git_repo.dir, ["push"]); | 1138 | let mut p = CliTester::new_git_with_remote_helper_from_dir(&git_repo.dir, ["push"]); |
| 1139 | cli_expect_nostr_fetch(&mut p)?; | 1139 | cli_expect_nostr_fetch(&mut p)?; |
| 1140 | p.expect(format!("fetching {} ref list over filesystem...\r\n", source_path).as_str())?; | 1140 | p.expect(format!("fetching {source_path} ref list over filesystem...\r\n").as_str())?; |
| 1141 | p.expect("list: connecting...\r\n")?; | 1141 | p.expect("list: connecting...\r\n")?; |
| 1142 | p.expect_eventually(format!( | 1142 | p.expect_eventually(format!( |
| 1143 | "fast-forward merge: create nostr proposal status event for {branch_name}\r\n" | 1143 | "fast-forward merge: create nostr proposal status event for {branch_name}\r\n" |
| @@ -1323,7 +1323,7 @@ async fn proposal_commits_applied_and_pushed_to_main_leads_to_status_event_issue | |||
| 1323 | 1323 | ||
| 1324 | let mut p = CliTester::new_git_with_remote_helper_from_dir(&git_repo.dir, ["push"]); | 1324 | let mut p = CliTester::new_git_with_remote_helper_from_dir(&git_repo.dir, ["push"]); |
| 1325 | cli_expect_nostr_fetch(&mut p)?; | 1325 | cli_expect_nostr_fetch(&mut p)?; |
| 1326 | p.expect(format!("fetching {} ref list over filesystem...\r\n", source_path).as_str())?; | 1326 | p.expect(format!("fetching {source_path} ref list over filesystem...\r\n").as_str())?; |
| 1327 | p.expect("list: connecting...\r\n")?; | 1327 | p.expect("list: connecting...\r\n")?; |
| 1328 | p.expect_eventually(format!( | 1328 | p.expect_eventually(format!( |
| 1329 | "applied commits from proposal: create nostr proposal status event for {branch_name}\r\n" ))?; | 1329 | "applied commits from proposal: create nostr proposal status event for {branch_name}\r\n" ))?; |
| @@ -1484,7 +1484,7 @@ async fn push_2_commits_to_existing_proposal() -> Result<()> { | |||
| 1484 | 1484 | ||
| 1485 | let mut p = CliTester::new_git_with_remote_helper_from_dir(&git_repo.dir, ["push"]); | 1485 | let mut p = CliTester::new_git_with_remote_helper_from_dir(&git_repo.dir, ["push"]); |
| 1486 | cli_expect_nostr_fetch(&mut p)?; | 1486 | cli_expect_nostr_fetch(&mut p)?; |
| 1487 | p.expect(format!("fetching {} ref list over filesystem...\r\n", source_path).as_str())?; | 1487 | p.expect(format!("fetching {source_path} ref list over filesystem...\r\n").as_str())?; |
| 1488 | p.expect("list: connecting...\r\n\r\r\r")?; | 1488 | p.expect("list: connecting...\r\n\r\r\r")?; |
| 1489 | p.expect_eventually_and_print(format!("To {}\r\n", get_nostr_remote_url()?).as_str())?; | 1489 | p.expect_eventually_and_print(format!("To {}\r\n", get_nostr_remote_url()?).as_str())?; |
| 1490 | let output = p.expect_end_eventually()?; | 1490 | let output = p.expect_end_eventually()?; |
| @@ -1639,7 +1639,7 @@ async fn force_push_creates_proposal_revision() -> Result<()> { | |||
| 1639 | let mut p = | 1639 | let mut p = |
| 1640 | CliTester::new_git_with_remote_helper_from_dir(&git_repo.dir, ["push", "--force"]); | 1640 | CliTester::new_git_with_remote_helper_from_dir(&git_repo.dir, ["push", "--force"]); |
| 1641 | cli_expect_nostr_fetch(&mut p)?; | 1641 | cli_expect_nostr_fetch(&mut p)?; |
| 1642 | p.expect(format!("fetching {} ref list over filesystem...\r\n", source_path).as_str())?; | 1642 | p.expect(format!("fetching {source_path} ref list over filesystem...\r\n").as_str())?; |
| 1643 | p.expect("list: connecting...\r\n")?; | 1643 | p.expect("list: connecting...\r\n")?; |
| 1644 | p.expect_eventually_and_print(format!("To {}\r\n", get_nostr_remote_url()?).as_str())?; | 1644 | p.expect_eventually_and_print(format!("To {}\r\n", get_nostr_remote_url()?).as_str())?; |
| 1645 | let output = p.expect_end_eventually()?; | 1645 | let output = p.expect_end_eventually()?; |
| @@ -1791,7 +1791,7 @@ async fn push_new_pr_branch_creates_proposal() -> Result<()> { | |||
| 1791 | branch_name, | 1791 | branch_name, |
| 1792 | ]); | 1792 | ]); |
| 1793 | cli_expect_nostr_fetch(&mut p)?; | 1793 | cli_expect_nostr_fetch(&mut p)?; |
| 1794 | p.expect(format!("fetching {} ref list over filesystem...\r\n", source_path).as_str())?; | 1794 | p.expect(format!("fetching {source_path} ref list over filesystem...\r\n").as_str())?; |
| 1795 | p.expect("list: connecting...\r\n\r\r\r")?; | 1795 | p.expect("list: connecting...\r\n\r\r\r")?; |
| 1796 | p.expect_eventually_and_print(format!("To {}\r\n", get_nostr_remote_url()?).as_str())?; | 1796 | p.expect_eventually_and_print(format!("To {}\r\n", get_nostr_remote_url()?).as_str())?; |
| 1797 | let output = p.expect_end_eventually()?; | 1797 | let output = p.expect_end_eventually()?; |