From 73480c03e194808bec7cbbf8c2d7064743d03369 Mon Sep 17 00:00:00 2001 From: DanConwayDev Date: Tue, 17 Sep 2024 11:23:44 +0100 Subject: test(remote): fix test to ignore status updates as changes to status updates has causes many tests to fail --- tests/git_remote_nostr/list.rs | 4 ++++ tests/git_remote_nostr/push.rs | 36 +++++++++++++++++++----------------- 2 files changed, 23 insertions(+), 17 deletions(-) (limited to 'tests/git_remote_nostr') diff --git a/tests/git_remote_nostr/list.rs b/tests/git_remote_nostr/list.rs index 0753a24..d173cc7 100644 --- a/tests/git_remote_nostr/list.rs +++ b/tests/git_remote_nostr/list.rs @@ -42,6 +42,7 @@ mod without_state_announcement { let mut p = cli_tester_after_fetch(&git_repo)?; p.send_line("list")?; p.expect(format!("fetching {} ref list over filesystem...\r\n", source_path).as_str())?; + p.expect("list: connecting...\r\n\r\r\r")?; // println!("{}", p.expect_eventually("\r\n\r\n")?); let res = p.expect_eventually("\r\n\r\n")?; p.exit()?; @@ -117,6 +118,7 @@ mod with_state_announcement { p.expect( format!("fetching {} ref list over filesystem...\r\n", source_path).as_str(), )?; + p.expect("list: connecting...\r\n\r\r\r")?; // println!("{}", p.expect_eventually("\r\n\r\n")?); let res = p.expect_eventually("\r\n\r\n")?; p.exit()?; @@ -200,6 +202,7 @@ mod with_state_announcement { p.expect( format!("fetching {} ref list over filesystem...\r\n", source_path).as_str(), )?; + p.expect("list: connecting...\r\n\r\r\r")?; p.expect( format!( "WARNING: {} refs/heads/main is out of sync with nostr \r\n", @@ -283,6 +286,7 @@ mod with_state_announcement { p.expect( format!("fetching {} ref list over filesystem...\r\n", source_path).as_str(), )?; + p.expect("list: connecting...\r\n\r\r\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 5066d33..7b6ab28 100644 --- a/tests/git_remote_nostr/push.rs +++ b/tests/git_remote_nostr/push.rs @@ -54,7 +54,7 @@ mod two_branches_in_batch_one_added_one_updated { p.send_line("push refs/heads/main:refs/heads/main")?; p.send_line("push refs/heads/vnext:refs/heads/vnext")?; p.send_line("")?; - p.expect_eventually("\r\n\r\n")?; + p.expect_eventually("\r\n\r\r\n")?; p.exit()?; for p in [51, 52, 53, 55, 56, 57] { relay::shutdown_relay(8000 + p)?; @@ -128,7 +128,7 @@ mod two_branches_in_batch_one_added_one_updated { p.send_line("push refs/heads/main:refs/heads/main")?; p.send_line("push refs/heads/vnext:refs/heads/vnext")?; p.send_line("")?; - p.expect_eventually("\r\n\r\n")?; + p.expect_eventually("\r\n\r\r\n")?; p.exit()?; for p in [51, 52, 53, 55, 56, 57] { relay::shutdown_relay(8000 + p)?; @@ -217,7 +217,7 @@ mod two_branches_in_batch_one_added_one_updated { p.send_line("")?; p.expect("ok refs/heads/main\r\n")?; p.expect("ok refs/heads/vnext\r\n")?; - p.expect("\r\n")?; + p.expect_eventually("\r\n\r\r\n")?; p.exit()?; for p in [51, 52, 53, 55, 56, 57] { relay::shutdown_relay(8000 + p)?; @@ -276,7 +276,7 @@ mod two_branches_in_batch_one_added_one_updated { p.send_line("push refs/heads/main:refs/heads/main")?; p.send_line("push refs/heads/vnext:refs/heads/vnext")?; p.send_line("")?; - p.expect_eventually_and_print("\r\n\r\n")?; + p.expect_eventually_and_print("\r\n\r\r\n")?; p.exit()?; for p in [51, 52, 53, 55, 56, 57] { relay::shutdown_relay(8000 + p)?; @@ -362,7 +362,7 @@ mod two_branches_in_batch_one_added_one_updated { p.send_line("push refs/heads/main:refs/heads/main")?; p.send_line("push refs/heads/vnext:refs/heads/vnext")?; p.send_line("")?; - p.expect_eventually_and_print("\r\n\r\n")?; + p.expect_eventually_and_print("\r\n\r\r\n")?; p.exit()?; for p in [51, 52, 53, 55, 56, 57] { relay::shutdown_relay(8000 + p)?; @@ -486,7 +486,7 @@ mod delete_one_branch { let mut p = cli_tester_after_nostr_fetch_and_sent_list_for_push_responds(&git_repo)?; p.send_line("push :refs/heads/vnext")?; p.send_line("")?; - p.expect_eventually_and_print("\r\n\r\n")?; + p.expect_eventually_and_print("\r\n\r\r\n")?; p.exit()?; for p in [51, 52, 53, 55, 56, 57] { relay::shutdown_relay(8000 + p)?; @@ -561,7 +561,7 @@ mod delete_one_branch { let mut p = cli_tester_after_nostr_fetch_and_sent_list_for_push_responds(&git_repo)?; p.send_line("push :refs/heads/vnext")?; p.send_line("")?; - p.expect_eventually("\r\n\r\n")?; + p.expect_eventually("\r\n\r\r\n")?; p.exit()?; for p in [51, 52, 53, 55, 56, 57] { relay::shutdown_relay(8000 + p)?; @@ -626,10 +626,8 @@ mod delete_one_branch { let mut p = cli_tester_after_nostr_fetch_and_sent_list_for_push_responds(&git_repo)?; p.send_line("push :refs/heads/vnext")?; p.send_line("")?; - // let res = p.expect_eventually("\r\n\r\n")?; - // println!("{res}"); p.expect("ok refs/heads/vnext\r\n")?; - p.expect("\r\n")?; + p.expect_eventually("\r\n\r\r\n")?; p.exit()?; for p in [51, 52, 53, 55, 56, 57] { relay::shutdown_relay(8000 + p)?; @@ -687,7 +685,7 @@ mod delete_one_branch { p.send_line("push :refs/heads/example-branch")?; p.send_line("")?; p.expect("ok refs/heads/example-branch\r\n")?; - p.expect("\r\n")?; + p.expect_eventually("\r\n\r\r\n")?; p.exit()?; for p in [51, 52, 53, 55, 56, 57] { relay::shutdown_relay(8000 + p)?; @@ -773,7 +771,7 @@ mod delete_one_branch { p.send_line("push :refs/heads/example-branch")?; p.send_line("")?; p.expect("ok refs/heads/example-branch\r\n")?; - p.expect("\r\n")?; + p.expect_eventually("\r\n")?; p.exit()?; for p in [51, 52, 53, 55, 56, 57] { relay::shutdown_relay(8000 + p)?; @@ -857,7 +855,7 @@ async fn pushes_to_all_git_servers_listed_and_ok_printed() -> Result<()> { p.send_line("push refs/heads/main:refs/heads/main")?; p.send_line("")?; p.expect("ok refs/heads/main\r\n")?; - p.expect("\r\n")?; + p.expect_eventually("\r\n\r\r\n")?; p.exit()?; for p in [51, 52, 53, 55, 56, 57] { relay::shutdown_relay(8000 + p)?; @@ -931,11 +929,12 @@ async fn proposal_merge_commit_pushed_to_main_leads_to_status_event_issued() -> 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 {} ref list over filesystem...\r\n", source_path).as_str())?; - - p.expect("merge commit ")?; + p.expect("list: connecting...\r\n")?; + p.expect_after_whitespace("merge commit ")?; // shorthand merge commit id appears in this gap p.expect_eventually(": create nostr proposal status event\r\n")?; - p.expect(format!("To {}\r\n", get_nostr_remote_url()?).as_str())?; + // status updates printed here + p.expect_eventually(format!("To {}\r\n", get_nostr_remote_url()?).as_str())?; let output = p.expect_end_eventually()?; for p in [51, 52, 53, 55, 56, 57] { @@ -1075,6 +1074,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 {} ref list over filesystem...\r\n", source_path).as_str())?; + p.expect("list: connecting...\r\n\r\r\r")?; p.expect(format!("To {}\r\n", get_nostr_remote_url()?).as_str())?; let output = p.expect_end_eventually()?; @@ -1229,7 +1229,8 @@ async fn force_push_creates_proposal_revision() -> Result<()> { CliTester::new_git_with_remote_helper_from_dir(&git_repo.dir, ["push", "--force"]); cli_expect_nostr_fetch(&mut p)?; p.expect(format!("fetching {} ref list over filesystem...\r\n", source_path).as_str())?; - p.expect(format!("To {}\r\n", get_nostr_remote_url()?).as_str())?; + p.expect("list: connecting...\r\n")?; + p.expect_after_whitespace(format!("To {}\r\n", get_nostr_remote_url()?).as_str())?; let output = p.expect_end_eventually()?; for p in [51, 52, 53, 55, 56, 57] { @@ -1378,6 +1379,7 @@ async fn push_new_pr_branch_creates_proposal() -> Result<()> { ); cli_expect_nostr_fetch(&mut p)?; p.expect(format!("fetching {} ref list over filesystem...\r\n", source_path).as_str())?; + p.expect("list: connecting...\r\n\r\r\r")?; p.expect(format!("To {}\r\n", get_nostr_remote_url()?).as_str())?; let output = p.expect_end_eventually()?; -- cgit v1.2.3