upleb.uk

Public git repos — served from a NIP-34 GRASP relay at git.upleb.uk

summaryrefslogtreecommitdiff
path: root/tests/git_remote_nostr
diff options
context:
space:
mode:
authorDanConwayDev <DanConwayDev@protonmail.com>2025-11-11 07:21:08 +0000
committerDanConwayDev <DanConwayDev@protonmail.com>2025-11-13 14:40:09 +0000
commit52370f542dad87ab029a5d701cc46658d5aef91b (patch)
treefb7f6283850f528aaeca8aec606dd5bd41906d9a /tests/git_remote_nostr
parentbe1a8e53383dc495ede773a76131fad81f04d101 (diff)
fix: cli output line deletion during fetch
also reduce the clutter in the cli output for grasp servers.
Diffstat (limited to 'tests/git_remote_nostr')
-rw-r--r--tests/git_remote_nostr/list.rs8
-rw-r--r--tests/git_remote_nostr/push.rs4
2 files changed, 6 insertions, 6 deletions
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 {
42 let mut p = cli_tester_after_fetch(&git_repo)?; 42 let mut p = cli_tester_after_fetch(&git_repo)?;
43 p.send_line("list")?; 43 p.send_line("list")?;
44 p.expect(format!("fetching {source_path} ref list over filesystem...\r\n").as_str())?; 44 p.expect(format!("fetching {source_path} ref list over filesystem...\r\n").as_str())?;
45 p.expect("list: connecting...\r\n\r\r\r")?; 45 p.expect("list: connecting...\r\n\r")?;
46 // println!("{}", p.expect_eventually("\r\n\r\n")?); 46 // println!("{}", p.expect_eventually("\r\n\r\n")?);
47 let res = p.expect_eventually("\r\n\r\n")?; 47 let res = p.expect_eventually("\r\n\r\n")?;
48 p.exit()?; 48 p.exit()?;
@@ -122,7 +122,7 @@ mod with_state_announcement {
122 p.expect( 122 p.expect(
123 format!("fetching {source_path} ref list over filesystem...\r\n").as_str(), 123 format!("fetching {source_path} ref list over filesystem...\r\n").as_str(),
124 )?; 124 )?;
125 p.expect("list: connecting...\r\n\r\r\r")?; 125 p.expect("list: connecting...\r\n\r")?;
126 // println!("{}", p.expect_eventually("\r\n\r\n")?); 126 // println!("{}", p.expect_eventually("\r\n\r\n")?);
127 let res = p.expect_eventually("\r\n\r\n")?; 127 let res = p.expect_eventually("\r\n\r\n")?;
128 p.exit()?; 128 p.exit()?;
@@ -206,7 +206,7 @@ mod with_state_announcement {
206 p.expect( 206 p.expect(
207 format!("fetching {source_path} ref list over filesystem...\r\n").as_str(), 207 format!("fetching {source_path} ref list over filesystem...\r\n").as_str(),
208 )?; 208 )?;
209 p.expect("list: connecting...\r\n\r\r\r")?; 209 p.expect("list: connecting...\r\n\r")?;
210 p.expect( 210 p.expect(
211 format!( 211 format!(
212 "WARNING: {source_path} refs/heads/main is out of sync with nostr \r\n" 212 "WARNING: {source_path} refs/heads/main is out of sync with nostr \r\n"
@@ -293,7 +293,7 @@ mod with_state_announcement {
293 p.expect( 293 p.expect(
294 format!("fetching {source_path} ref list over filesystem...\r\n").as_str(), 294 format!("fetching {source_path} ref list over filesystem...\r\n").as_str(),
295 )?; 295 )?;
296 p.expect("list: connecting...\r\n\r\r\r")?; 296 p.expect("list: connecting...\r\n\r")?;
297 // println!("{}", p.expect_eventually("\r\n\r\n")?); 297 // println!("{}", p.expect_eventually("\r\n\r\n")?);
298 let res = p.expect_eventually("\r\n\r\n")?; 298 let res = p.expect_eventually("\r\n\r\n")?;
299 299
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<()> {
1385 let mut p = CliTester::new_git_with_remote_helper_from_dir(&git_repo.dir, ["push"]); 1385 let mut p = CliTester::new_git_with_remote_helper_from_dir(&git_repo.dir, ["push"]);
1386 cli_expect_nostr_fetch(&mut p)?; 1386 cli_expect_nostr_fetch(&mut p)?;
1387 p.expect(format!("fetching {source_path} ref list over filesystem...\r\n").as_str())?; 1387 p.expect(format!("fetching {source_path} ref list over filesystem...\r\n").as_str())?;
1388 p.expect("list: connecting...\r\n\r\r\r")?; 1388 p.expect("list: connecting...\r\n\r")?;
1389 p.expect_eventually_and_print(format!("To {}\r\n", get_nostr_remote_url()?).as_str())?; 1389 p.expect_eventually_and_print(format!("To {}\r\n", get_nostr_remote_url()?).as_str())?;
1390 let output = p.expect_end_eventually()?; 1390 let output = p.expect_end_eventually()?;
1391 1391
@@ -1694,7 +1694,7 @@ async fn push_new_pr_branch_creates_proposal() -> Result<()> {
1694 ); 1694 );
1695 cli_expect_nostr_fetch(&mut p)?; 1695 cli_expect_nostr_fetch(&mut p)?;
1696 p.expect(format!("fetching {source_path} ref list over filesystem...\r\n").as_str())?; 1696 p.expect(format!("fetching {source_path} ref list over filesystem...\r\n").as_str())?;
1697 p.expect("list: connecting...\r\n\r\r\r")?; 1697 p.expect("list: connecting...\r\n\r")?;
1698 p.expect_eventually_and_print(format!("To {}\r\n", get_nostr_remote_url()?).as_str())?; 1698 p.expect_eventually_and_print(format!("To {}\r\n", get_nostr_remote_url()?).as_str())?;
1699 let output = p.expect_end_eventually()?; 1699 let output = p.expect_end_eventually()?;
1700 1700