From 47271a823485c002ab6c3f304b86dbba2d7594dd Mon Sep 17 00:00:00 2001
From: DanConwayDev <DanConwayDev@protonmail.com>
Date: Tue, 6 Aug 2024 11:49:28 +0100
Subject: feat(remote): `fetch` report on progress

so that user knows what step we are on
---
 tests/git_remote_helper.rs | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

(limited to 'tests')

diff --git a/tests/git_remote_helper.rs b/tests/git_remote_helper.rs
index 77d7ecb..f86cb7a 100644
--- a/tests/git_remote_helper.rs
+++ b/tests/git_remote_helper.rs
@@ -558,6 +558,8 @@ mod fetch {
     #[serial]
     async fn fetch_downloads_speficied_commits_from_git_server() -> Result<()> {
         let source_git_repo = prep_git_repo()?;
+        let source_path = source_git_repo.dir.to_str().unwrap().to_string();
+
         std::fs::write(source_git_repo.dir.join("commit.md"), "some content")?;
         let main_commit_id = source_git_repo.stage_and_commit("commit.md")?;
 
@@ -594,7 +596,8 @@ mod fetch {
             p.send_line(format!("fetch {main_commit_id} main").as_str())?;
             p.send_line(format!("fetch {vnext_commit_id} vnext").as_str())?;
             p.send_line("")?;
-            p.expect("\r\n")?;
+            p.expect(format!("fetching from {source_path}...\r\n").as_str())?;
+            p.expect_eventually_and_print("\r\n")?;
 
             assert!(git_repo.git_repo.find_commit(main_commit_id).is_ok());
             assert!(git_repo.git_repo.find_commit(vnext_commit_id).is_ok());
@@ -625,6 +628,8 @@ mod fetch {
         #[serial]
         async fn fetch_downloads_speficied_commits_from_second_git_server() -> Result<()> {
             let (state_event, source_git_repo) = generate_repo_with_state_event().await?;
+            // let source_path = source_git_repo.dir.to_str().unwrap().to_string();
+            let error_path = "./path-doesnt-exist".to_string();
 
             let main_commit_id = source_git_repo.get_tip_of_local_branch("main")?;
 
@@ -634,7 +639,7 @@ mod fetch {
                 generate_test_key_1_metadata_event("fred"),
                 generate_test_key_1_relay_list_event(),
                 generate_repo_ref_event_with_git_server(vec![
-                    "./path-doesnt-exist".to_string(),
+                    error_path.to_string(),
                     source_git_repo.dir.to_str().unwrap().to_string(),
                 ]),
                 state_event,
@@ -657,7 +662,11 @@ mod fetch {
                 let mut p = cli_tester_after_fetch(&git_repo)?;
                 p.send_line(format!("fetch {main_commit_id} main").as_str())?;
                 p.send_line("")?;
-                p.expect("\r\n")?;
+                p.expect(format!("fetching from {error_path}...\r\n").as_str())?;
+                // not sure why the below isn't appearing
+                // p.expect(format!("fetching from {source_path}...\r\n").as_str())?;
+                p.expect_eventually_and_print("\r\n")?;
+                // p.expect("\r\n")?;
 
                 assert!(git_repo.git_repo.find_commit(main_commit_id).is_ok());
 
-- 
cgit v1.2.3