diff options
Diffstat (limited to 'tests/git_remote_nostr/list.rs')
| -rw-r--r-- | tests/git_remote_nostr/list.rs | 29 |
1 files changed, 8 insertions, 21 deletions
diff --git a/tests/git_remote_nostr/list.rs b/tests/git_remote_nostr/list.rs index 8723b54..88bd3f7 100644 --- a/tests/git_remote_nostr/list.rs +++ b/tests/git_remote_nostr/list.rs | |||
| @@ -8,7 +8,7 @@ mod without_state_announcement { | |||
| 8 | #[serial] | 8 | #[serial] |
| 9 | async fn lists_head_and_2_branches_and_commit_ids_from_git_server() -> Result<()> { | 9 | async fn lists_head_and_2_branches_and_commit_ids_from_git_server() -> Result<()> { |
| 10 | let source_git_repo = prep_git_repo()?; | 10 | let source_git_repo = prep_git_repo()?; |
| 11 | let source_path = source_git_repo.dir.to_str().unwrap().to_string(); | 11 | let _source_path = source_git_repo.dir.to_str().unwrap().to_string(); |
| 12 | std::fs::write(source_git_repo.dir.join("commit.md"), "some content")?; | 12 | std::fs::write(source_git_repo.dir.join("commit.md"), "some content")?; |
| 13 | let main_commit_id = source_git_repo.stage_and_commit("commit.md")?; | 13 | let main_commit_id = source_git_repo.stage_and_commit("commit.md")?; |
| 14 | 14 | ||
| @@ -41,8 +41,7 @@ mod without_state_announcement { | |||
| 41 | let cli_tester_handle = std::thread::spawn(move || -> Result<()> { | 41 | let cli_tester_handle = std::thread::spawn(move || -> Result<()> { |
| 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("git servers: listing refs...\r\n")?; |
| 45 | p.expect("list: connecting...\r\n\r")?; | ||
| 46 | // println!("{}", p.expect_eventually("\r\n\r\n")?); | 45 | // println!("{}", p.expect_eventually("\r\n\r\n")?); |
| 47 | let res = p.expect_eventually("\r\n\r\n")?; | 46 | let res = p.expect_eventually("\r\n\r\n")?; |
| 48 | p.exit()?; | 47 | p.exit()?; |
| @@ -90,7 +89,7 @@ mod with_state_announcement { | |||
| 90 | #[serial] | 89 | #[serial] |
| 91 | async fn lists_head_and_2_branches_and_commit_ids_announcement() -> Result<()> { | 90 | async fn lists_head_and_2_branches_and_commit_ids_announcement() -> Result<()> { |
| 92 | let (state_event, source_git_repo) = generate_repo_with_state_event().await?; | 91 | let (state_event, source_git_repo) = generate_repo_with_state_event().await?; |
| 93 | let source_path = source_git_repo.dir.to_str().unwrap().to_string(); | 92 | let _source_path = source_git_repo.dir.to_str().unwrap().to_string(); |
| 94 | 93 | ||
| 95 | let main_commit_id = source_git_repo.get_tip_of_local_branch("main")?; | 94 | let main_commit_id = source_git_repo.get_tip_of_local_branch("main")?; |
| 96 | let example_commit_id = source_git_repo.get_tip_of_local_branch("example-branch")?; | 95 | let example_commit_id = source_git_repo.get_tip_of_local_branch("example-branch")?; |
| @@ -119,10 +118,7 @@ mod with_state_announcement { | |||
| 119 | let cli_tester_handle = std::thread::spawn(move || -> Result<()> { | 118 | let cli_tester_handle = std::thread::spawn(move || -> Result<()> { |
| 120 | let mut p = cli_tester_after_fetch(&git_repo)?; | 119 | let mut p = cli_tester_after_fetch(&git_repo)?; |
| 121 | p.send_line("list")?; | 120 | p.send_line("list")?; |
| 122 | p.expect( | 121 | p.expect("git servers: listing refs...\r\n")?; |
| 123 | format!("fetching {source_path} ref list over filesystem...\r\n").as_str(), | ||
| 124 | )?; | ||
| 125 | p.expect("list: connecting...\r\n\r")?; | ||
| 126 | // println!("{}", p.expect_eventually("\r\n\r\n")?); | 122 | // println!("{}", p.expect_eventually("\r\n\r\n")?); |
| 127 | let res = p.expect_eventually("\r\n\r\n")?; | 123 | let res = p.expect_eventually("\r\n\r\n")?; |
| 128 | p.exit()?; | 124 | p.exit()?; |
| @@ -163,7 +159,7 @@ mod with_state_announcement { | |||
| 163 | #[serial] | 159 | #[serial] |
| 164 | async fn anouncement_state_is_used() -> Result<()> { | 160 | async fn anouncement_state_is_used() -> Result<()> { |
| 165 | let (state_event, source_git_repo) = generate_repo_with_state_event().await?; | 161 | let (state_event, source_git_repo) = generate_repo_with_state_event().await?; |
| 166 | let source_path = source_git_repo.dir.to_str().unwrap().to_string(); | 162 | let _source_path = source_git_repo.dir.to_str().unwrap().to_string(); |
| 167 | let main_original_commit_id = source_git_repo.get_tip_of_local_branch("main")?; | 163 | let main_original_commit_id = source_git_repo.get_tip_of_local_branch("main")?; |
| 168 | 164 | ||
| 169 | { | 165 | { |
| @@ -203,13 +199,7 @@ mod with_state_announcement { | |||
| 203 | let cli_tester_handle = std::thread::spawn(move || -> Result<()> { | 199 | let cli_tester_handle = std::thread::spawn(move || -> Result<()> { |
| 204 | let mut p = cli_tester_after_fetch(&git_repo)?; | 200 | let mut p = cli_tester_after_fetch(&git_repo)?; |
| 205 | p.send_line("list")?; | 201 | p.send_line("list")?; |
| 206 | p.expect( | 202 | p.expect("git servers: listing refs...\r\n")?; |
| 207 | format!("fetching {source_path} ref list over filesystem...\r\n").as_str(), | ||
| 208 | )?; | ||
| 209 | p.expect("list: connecting...\r\n\r")?; | ||
| 210 | p.expect( | ||
| 211 | format!("WARNING: {source_path} is out of sync. main out of sync\r\n").as_str(), | ||
| 212 | )?; | ||
| 213 | 203 | ||
| 214 | // println!("{}", p.expect_eventually("\r\n\r\n")?); | 204 | // println!("{}", p.expect_eventually("\r\n\r\n")?); |
| 215 | let res = p.expect_eventually("\r\n\r\n")?; | 205 | let res = p.expect_eventually("\r\n\r\n")?; |
| @@ -255,7 +245,7 @@ mod with_state_announcement { | |||
| 255 | #[serial] | 245 | #[serial] |
| 256 | async fn open_proposal_listed_in_prs_namespace() -> Result<()> { | 246 | async fn open_proposal_listed_in_prs_namespace() -> Result<()> { |
| 257 | let (state_event, source_git_repo) = generate_repo_with_state_event().await?; | 247 | let (state_event, source_git_repo) = generate_repo_with_state_event().await?; |
| 258 | let source_path = source_git_repo.dir.to_str().unwrap().to_string(); | 248 | let _source_path = source_git_repo.dir.to_str().unwrap().to_string(); |
| 259 | 249 | ||
| 260 | let main_commit_id = source_git_repo.get_tip_of_local_branch("main")?; | 250 | let main_commit_id = source_git_repo.get_tip_of_local_branch("main")?; |
| 261 | let example_commit_id = source_git_repo.get_tip_of_local_branch("example-branch")?; | 251 | let example_commit_id = source_git_repo.get_tip_of_local_branch("example-branch")?; |
| @@ -287,10 +277,7 @@ mod with_state_announcement { | |||
| 287 | 277 | ||
| 288 | let mut p = cli_tester_after_fetch(&git_repo)?; | 278 | let mut p = cli_tester_after_fetch(&git_repo)?; |
| 289 | p.send_line("list")?; | 279 | p.send_line("list")?; |
| 290 | p.expect( | 280 | p.expect("git servers: listing refs...\r\n")?; |
| 291 | format!("fetching {source_path} ref list over filesystem...\r\n").as_str(), | ||
| 292 | )?; | ||
| 293 | p.expect("list: connecting...\r\n\r")?; | ||
| 294 | // println!("{}", p.expect_eventually("\r\n\r\n")?); | 281 | // println!("{}", p.expect_eventually("\r\n\r\n")?); |
| 295 | let res = p.expect_eventually("\r\n\r\n")?; | 282 | let res = p.expect_eventually("\r\n\r\n")?; |
| 296 | 283 | ||