From 52370f542dad87ab029a5d701cc46658d5aef91b Mon Sep 17 00:00:00 2001 From: DanConwayDev Date: Tue, 11 Nov 2025 07:21:08 +0000 Subject: fix: cli output line deletion during fetch also reduce the clutter in the cli output for grasp servers. --- tests/git_remote_nostr/list.rs | 8 ++++---- tests/git_remote_nostr/push.rs | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'tests') diff --git a/tests/git_remote_nostr/list.rs b/tests/git_remote_nostr/list.rs index 1972cd5..530e022 100644 --- a/tests/git_remote_nostr/list.rs +++ b/tests/git_remote_nostr/list.rs @@ -42,7 +42,7 @@ mod without_state_announcement { let mut p = cli_tester_after_fetch(&git_repo)?; p.send_line("list")?; p.expect(format!("fetching {source_path} ref list over filesystem...\r\n").as_str())?; - p.expect("list: connecting...\r\n\r\r\r")?; + p.expect("list: connecting...\r\n\r")?; // println!("{}", p.expect_eventually("\r\n\r\n")?); let res = p.expect_eventually("\r\n\r\n")?; p.exit()?; @@ -122,7 +122,7 @@ mod with_state_announcement { p.expect( format!("fetching {source_path} ref list over filesystem...\r\n").as_str(), )?; - p.expect("list: connecting...\r\n\r\r\r")?; + p.expect("list: connecting...\r\n\r")?; // println!("{}", p.expect_eventually("\r\n\r\n")?); let res = p.expect_eventually("\r\n\r\n")?; p.exit()?; @@ -206,7 +206,7 @@ mod with_state_announcement { p.expect( format!("fetching {source_path} ref list over filesystem...\r\n").as_str(), )?; - p.expect("list: connecting...\r\n\r\r\r")?; + p.expect("list: connecting...\r\n\r")?; p.expect( format!( "WARNING: {source_path} refs/heads/main is out of sync with nostr \r\n" @@ -293,7 +293,7 @@ mod with_state_announcement { p.expect( format!("fetching {source_path} ref list over filesystem...\r\n").as_str(), )?; - p.expect("list: connecting...\r\n\r\r\r")?; + p.expect("list: connecting...\r\n\r")?; // println!("{}", p.expect_eventually("\r\n\r\n")?); let res = p.expect_eventually("\r\n\r\n")?; diff --git a/tests/git_remote_nostr/push.rs b/tests/git_remote_nostr/push.rs index 91a20d8..647a2f3 100644 --- a/tests/git_remote_nostr/push.rs +++ b/tests/git_remote_nostr/push.rs @@ -1385,7 +1385,7 @@ async fn push_2_commits_to_existing_proposal() -> Result<()> { let mut p = CliTester::new_git_with_remote_helper_from_dir(&git_repo.dir, ["push"]); cli_expect_nostr_fetch(&mut p)?; p.expect(format!("fetching {source_path} ref list over filesystem...\r\n").as_str())?; - p.expect("list: connecting...\r\n\r\r\r")?; + p.expect("list: connecting...\r\n\r")?; p.expect_eventually_and_print(format!("To {}\r\n", get_nostr_remote_url()?).as_str())?; let output = p.expect_end_eventually()?; @@ -1694,7 +1694,7 @@ async fn push_new_pr_branch_creates_proposal() -> Result<()> { ); cli_expect_nostr_fetch(&mut p)?; p.expect(format!("fetching {source_path} ref list over filesystem...\r\n").as_str())?; - p.expect("list: connecting...\r\n\r\r\r")?; + p.expect("list: connecting...\r\n\r")?; p.expect_eventually_and_print(format!("To {}\r\n", get_nostr_remote_url()?).as_str())?; let output = p.expect_end_eventually()?; -- cgit v1.2.3