upleb.uk

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

summaryrefslogtreecommitdiff
path: root/tests/ngit_send.rs
diff options
context:
space:
mode:
Diffstat (limited to 'tests/ngit_send.rs')
-rw-r--r--tests/ngit_send.rs167
1 files changed, 127 insertions, 40 deletions
diff --git a/tests/ngit_send.rs b/tests/ngit_send.rs
index 7946aef..7170f84 100644
--- a/tests/ngit_send.rs
+++ b/tests/ngit_send.rs
@@ -56,6 +56,29 @@ mod when_commits_behind_ask_to_proceed {
56 )) 56 ))
57 } 57 }
58 58
59 fn create_relay_55() -> Result<Relay<'static>> {
60 Ok(Relay::new(
61 8055,
62 None,
63 Some(&|relay, client_id, subscription_id, _| -> Result<()> {
64 relay.respond_events(
65 client_id,
66 &subscription_id,
67 &vec![
68 generate_repo_ref_event(),
69 generate_test_key_1_metadata_event("fred"),
70 generate_test_key_1_relay_list_event(),
71 ],
72 )?;
73 Ok(())
74 }),
75 ))
76 }
77
78 fn create_relay_56() -> Result<Relay<'static>> {
79 Ok(Relay::new(8056, None, None))
80 }
81
59 fn expect_confirm_prompt(p: &'_ mut CliTester) -> Result<CliTesterConfirmPrompt<'_>> { 82 fn expect_confirm_prompt(p: &'_ mut CliTester) -> Result<CliTesterConfirmPrompt<'_>> {
60 p.expect("fetching updates...\r\n")?; 83 p.expect("fetching updates...\r\n")?;
61 p.expect_eventually("\r\n")?; // may be 'no updates' or some updates 84 p.expect_eventually("\r\n")?; // may be 'no updates' or some updates
@@ -73,17 +96,25 @@ mod when_commits_behind_ask_to_proceed {
73 async fn asked_with_default_no() -> Result<()> { 96 async fn asked_with_default_no() -> Result<()> {
74 let test_repo = prep_test_repo()?; 97 let test_repo = prep_test_repo()?;
75 let mut r51 = create_relay_51()?; 98 let mut r51 = create_relay_51()?;
99 let mut r55 = create_relay_55()?;
100 let mut r56 = create_relay_56()?;
76 // // check relay had the right number of events 101 // // check relay had the right number of events
77 let cli_tester_handle = std::thread::spawn(move || -> Result<()> { 102 let cli_tester_handle = std::thread::spawn(move || -> Result<()> {
78 let mut p = CliTester::new_from_dir(&test_repo.dir, ["-i", "send", "HEAD~2"]); 103 let mut p = CliTester::new_from_dir(&test_repo.dir, ["-i", "send", "HEAD~2"]);
79 expect_confirm_prompt(&mut p)?; 104 expect_confirm_prompt(&mut p)?;
80 p.exit()?; 105 p.exit()?;
81 relay::shutdown_relay(8051)?; 106 for p in [51, 55, 56] {
107 relay::shutdown_relay(8000 + p)?;
108 }
82 Ok(()) 109 Ok(())
83 }); 110 });
84 111
85 // launch relay 112 // launch relay
86 r51.listen_until_close().await?; 113 let _ = join!(
114 r51.listen_until_close(),
115 r55.listen_until_close(),
116 r56.listen_until_close(),
117 );
87 cli_tester_handle.join().unwrap()?; 118 cli_tester_handle.join().unwrap()?;
88 Ok(()) 119 Ok(())
89 } 120 }
@@ -93,16 +124,24 @@ mod when_commits_behind_ask_to_proceed {
93 async fn when_response_is_false_aborts() -> Result<()> { 124 async fn when_response_is_false_aborts() -> Result<()> {
94 let test_repo = prep_test_repo()?; 125 let test_repo = prep_test_repo()?;
95 let mut r51 = create_relay_51()?; 126 let mut r51 = create_relay_51()?;
127 let mut r55 = create_relay_55()?;
128 let mut r56 = create_relay_56()?;
96 let cli_tester_handle = std::thread::spawn(move || -> Result<()> { 129 let cli_tester_handle = std::thread::spawn(move || -> Result<()> {
97 let mut p = CliTester::new_from_dir(&test_repo.dir, ["-i", "send", "HEAD~2"]); 130 let mut p = CliTester::new_from_dir(&test_repo.dir, ["-i", "send", "HEAD~2"]);
98 expect_confirm_prompt(&mut p)?.succeeds_with(Some(false))?; 131 expect_confirm_prompt(&mut p)?.succeeds_with(Some(false))?;
99 p.expect_end_with("Error: aborting so commits can be rebased\r\n")?; 132 p.expect_end_with("Error: aborting so commits can be rebased\r\n")?;
100 relay::shutdown_relay(8051)?; 133 for p in [51, 55, 56] {
134 relay::shutdown_relay(8000 + p)?;
135 }
101 Ok(()) 136 Ok(())
102 }); 137 });
103 138
104 // launch relay 139 // launch relay
105 r51.listen_until_close().await?; 140 let _ = join!(
141 r51.listen_until_close(),
142 r55.listen_until_close(),
143 r56.listen_until_close(),
144 );
106 cli_tester_handle.join().unwrap()?; 145 cli_tester_handle.join().unwrap()?;
107 Ok(()) 146 Ok(())
108 } 147 }
@@ -112,17 +151,25 @@ mod when_commits_behind_ask_to_proceed {
112 async fn when_response_is_true_proceeds() -> Result<()> { 151 async fn when_response_is_true_proceeds() -> Result<()> {
113 let test_repo = prep_test_repo()?; 152 let test_repo = prep_test_repo()?;
114 let mut r51 = create_relay_51()?; 153 let mut r51 = create_relay_51()?;
154 let mut r55 = create_relay_55()?;
155 let mut r56 = create_relay_56()?;
115 let cli_tester_handle = std::thread::spawn(move || -> Result<()> { 156 let cli_tester_handle = std::thread::spawn(move || -> Result<()> {
116 let mut p = CliTester::new_from_dir(&test_repo.dir, ["-i", "send", "HEAD~2"]); 157 let mut p = CliTester::new_from_dir(&test_repo.dir, ["-i", "send", "HEAD~2"]);
117 expect_confirm_prompt(&mut p)?.succeeds_with(Some(true))?; 158 expect_confirm_prompt(&mut p)?.succeeds_with(Some(true))?;
118 p.expect("? include cover letter")?; 159 p.expect("? include cover letter")?;
119 p.exit()?; 160 p.exit()?;
120 relay::shutdown_relay(8051)?; 161 for p in [51, 55, 56] {
162 relay::shutdown_relay(8000 + p)?;
163 }
121 Ok(()) 164 Ok(())
122 }); 165 });
123 166
124 // launch relay 167 // launch relay
125 r51.listen_until_close().await?; 168 let _ = join!(
169 r51.listen_until_close(),
170 r55.listen_until_close(),
171 r56.listen_until_close(),
172 );
126 cli_tester_handle.join().unwrap()?; 173 cli_tester_handle.join().unwrap()?;
127 Ok(()) 174 Ok(())
128 } 175 }
@@ -245,7 +292,11 @@ async fn prep_run_create_proposal(
245 relay.respond_events( 292 relay.respond_events(
246 client_id, 293 client_id,
247 &subscription_id, 294 &subscription_id,
248 &vec![generate_repo_ref_event()], 295 &vec![
296 generate_repo_ref_event(),
297 generate_test_key_1_metadata_event("fred"),
298 generate_test_key_1_relay_list_event(),
299 ],
249 )?; 300 )?;
250 Ok(()) 301 Ok(())
251 }), 302 }),
@@ -319,13 +370,11 @@ mod when_cover_letter_details_specified_with_range_of_head_2_sends_cover_letter_
319 370
320 #[tokio::test] 371 #[tokio::test]
321 #[serial] 372 #[serial]
322 async fn only_1_cover_letter_event_sent_to_fallback_relays() -> Result<()> { 373 async fn no_events_sent_to_fallback_relays() -> Result<()> {
323 let (r51, r52, _, _, _) = prep_run_create_proposal(true).await?; 374 let (r51, r52, _, _, _) = prep_run_create_proposal(true).await?;
375 // Fallback relays should not receive events when repo relays exist
324 for relay in [&r51, &r52] { 376 for relay in [&r51, &r52] {
325 assert_eq!( 377 assert_eq!(relay.events.len(), 0);
326 relay.events.iter().filter(|e| is_cover_letter(e)).count(),
327 1,
328 );
329 } 378 }
330 Ok(()) 379 Ok(())
331 } 380 }
@@ -333,8 +382,9 @@ mod when_cover_letter_details_specified_with_range_of_head_2_sends_cover_letter_
333 #[tokio::test] 382 #[tokio::test]
334 #[serial] 383 #[serial]
335 async fn only_2_patch_kind_events_sent_to_each_relay() -> Result<()> { 384 async fn only_2_patch_kind_events_sent_to_each_relay() -> Result<()> {
336 let (r51, r52, r53, r55, r56) = prep_run_create_proposal(true).await?; 385 let (_, _, r53, r55, r56) = prep_run_create_proposal(true).await?;
337 for relay in [&r51, &r52, &r53, &r55, &r56] { 386 // Only user and repo relays should receive patches, not fallback relays
387 for relay in [&r53, &r55, &r56] {
338 assert_eq!(relay.events.iter().filter(|e| is_patch(e)).count(), 2,); 388 assert_eq!(relay.events.iter().filter(|e| is_patch(e)).count(), 2,);
339 } 389 }
340 Ok(()) 390 Ok(())
@@ -832,7 +882,11 @@ mod when_cover_letter_details_specified_with_range_of_head_2_sends_cover_letter_
832 relay.respond_events( 882 relay.respond_events(
833 client_id, 883 client_id,
834 &subscription_id, 884 &subscription_id,
835 &vec![generate_repo_ref_event()], 885 &vec![
886 generate_repo_ref_event(),
887 generate_test_key_1_metadata_event("fred"),
888 generate_test_key_1_relay_list_event(),
889 ],
836 )?; 890 )?;
837 Ok(()) 891 Ok(())
838 }), 892 }),
@@ -848,10 +902,8 @@ mod when_cover_letter_details_specified_with_range_of_head_2_sends_cover_letter_
848 &mut p, 902 &mut p,
849 vec![ 903 vec![
850 (" [my-relay] [repo-relay] ws://localhost:8055", true, ""), 904 (" [my-relay] [repo-relay] ws://localhost:8055", true, ""),
851 (" [my-relay] ws://localhost:8053", true, ""),
852 (" [repo-relay] ws://localhost:8056", true, ""), 905 (" [repo-relay] ws://localhost:8056", true, ""),
853 (" [default] ws://localhost:8051", true, ""), 906 (" [my-relay] ws://localhost:8053", true, ""),
854 (" [default] ws://localhost:8052", true, ""),
855 ], 907 ],
856 3, 908 3,
857 )?; 909 )?;
@@ -912,7 +964,11 @@ mod when_cover_letter_details_specified_with_range_of_head_2_sends_cover_letter_
912 relay.respond_events( 964 relay.respond_events(
913 client_id, 965 client_id,
914 &subscription_id, 966 &subscription_id,
915 &vec![generate_repo_ref_event()], 967 &vec![
968 generate_repo_ref_event(),
969 generate_test_key_1_metadata_event("fred"),
970 generate_test_key_1_relay_list_event(),
971 ],
916 )?; 972 )?;
917 Ok(()) 973 Ok(())
918 }), 974 }),
@@ -986,7 +1042,11 @@ mod when_cover_letter_details_specified_with_range_of_head_2_sends_cover_letter_
986 relay.respond_events( 1042 relay.respond_events(
987 client_id, 1043 client_id,
988 &subscription_id, 1044 &subscription_id,
989 &vec![generate_repo_ref_event()], 1045 &vec![
1046 generate_repo_ref_event(),
1047 generate_test_key_1_metadata_event("fred"),
1048 generate_test_key_1_relay_list_event(),
1049 ],
990 )?; 1050 )?;
991 Ok(()) 1051 Ok(())
992 }), 1052 }),
@@ -1009,14 +1069,12 @@ mod when_cover_letter_details_specified_with_range_of_head_2_sends_cover_letter_
1009 &mut p, 1069 &mut p,
1010 vec![ 1070 vec![
1011 (" [my-relay] [repo-relay] ws://localhost:8055", true, ""), 1071 (" [my-relay] [repo-relay] ws://localhost:8055", true, ""),
1012 (" [my-relay] ws://localhost:8053", true, ""),
1013 ( 1072 (
1014 " [repo-relay] ws://localhost:8056", 1073 " [repo-relay] ws://localhost:8056",
1015 false, 1074 false,
1016 "error: Payment Required", 1075 "error: Payment Required",
1017 ), 1076 ),
1018 (" [default] ws://localhost:8051", true, ""), 1077 (" [my-relay] ws://localhost:8053", true, ""),
1019 (" [default] ws://localhost:8052", true, ""),
1020 ], 1078 ],
1021 3, 1079 3,
1022 )?; 1080 )?;
@@ -1080,7 +1138,11 @@ mod when_no_cover_letter_flag_set_with_range_of_head_2_sends_2_patches_without_c
1080 relay.respond_events( 1138 relay.respond_events(
1081 client_id, 1139 client_id,
1082 &subscription_id, 1140 &subscription_id,
1083 &vec![generate_repo_ref_event()], 1141 &vec![
1142 generate_repo_ref_event(),
1143 generate_test_key_1_metadata_event("fred"),
1144 generate_test_key_1_relay_list_event(),
1145 ],
1084 )?; 1146 )?;
1085 Ok(()) 1147 Ok(())
1086 }), 1148 }),
@@ -1097,10 +1159,8 @@ mod when_no_cover_letter_flag_set_with_range_of_head_2_sends_2_patches_without_c
1097 &mut p, 1159 &mut p,
1098 vec![ 1160 vec![
1099 (" [my-relay] [repo-relay] ws://localhost:8055", true, ""), 1161 (" [my-relay] [repo-relay] ws://localhost:8055", true, ""),
1100 (" [my-relay] ws://localhost:8053", true, ""),
1101 (" [repo-relay] ws://localhost:8056", true, ""), 1162 (" [repo-relay] ws://localhost:8056", true, ""),
1102 (" [default] ws://localhost:8051", true, ""), 1163 (" [my-relay] ws://localhost:8053", true, ""),
1103 (" [default] ws://localhost:8052", true, ""),
1104 ], 1164 ],
1105 2, 1165 2,
1106 )?; 1166 )?;
@@ -1303,7 +1363,11 @@ mod when_range_ommited_prompts_for_selection_defaulting_ahead_of_main {
1303 relay.respond_events( 1363 relay.respond_events(
1304 client_id, 1364 client_id,
1305 &subscription_id, 1365 &subscription_id,
1306 &vec![generate_repo_ref_event()], 1366 &vec![
1367 generate_repo_ref_event(),
1368 generate_test_key_1_metadata_event("fred"),
1369 generate_test_key_1_relay_list_event(),
1370 ],
1307 )?; 1371 )?;
1308 Ok(()) 1372 Ok(())
1309 }), 1373 }),
@@ -1366,7 +1430,11 @@ mod when_range_ommited_prompts_for_selection_defaulting_ahead_of_main {
1366 relay.respond_events( 1430 relay.respond_events(
1367 client_id, 1431 client_id,
1368 &subscription_id, 1432 &subscription_id,
1369 &vec![generate_repo_ref_event()], 1433 &vec![
1434 generate_repo_ref_event(),
1435 generate_test_key_1_metadata_event("fred"),
1436 generate_test_key_1_relay_list_event(),
1437 ],
1370 )?; 1438 )?;
1371 Ok(()) 1439 Ok(())
1372 }), 1440 }),
@@ -1382,10 +1450,8 @@ mod when_range_ommited_prompts_for_selection_defaulting_ahead_of_main {
1382 &mut p, 1450 &mut p,
1383 vec![ 1451 vec![
1384 (" [my-relay] [repo-relay] ws://localhost:8055", true, ""), 1452 (" [my-relay] [repo-relay] ws://localhost:8055", true, ""),
1385 (" [my-relay] ws://localhost:8053", true, ""),
1386 (" [repo-relay] ws://localhost:8056", true, ""), 1453 (" [repo-relay] ws://localhost:8056", true, ""),
1387 (" [default] ws://localhost:8051", true, ""), 1454 (" [my-relay] ws://localhost:8053", true, ""),
1388 (" [default] ws://localhost:8052", true, ""),
1389 ], 1455 ],
1390 2, 1456 2,
1391 )?; 1457 )?;
@@ -1504,7 +1570,12 @@ mod root_proposal_specified_using_in_reply_to_with_range_of_head_2_and_cover_let
1504 relay.respond_events( 1570 relay.respond_events(
1505 client_id, 1571 client_id,
1506 &subscription_id, 1572 &subscription_id,
1507 &vec![generate_repo_ref_event(), get_pretend_proposal_root_event()], 1573 &vec![
1574 generate_repo_ref_event(),
1575 get_pretend_proposal_root_event(),
1576 generate_test_key_1_metadata_event("fred"),
1577 generate_test_key_1_relay_list_event(),
1578 ],
1508 )?; 1579 )?;
1509 Ok(()) 1580 Ok(())
1510 }), 1581 }),
@@ -1567,7 +1638,12 @@ mod root_proposal_specified_using_in_reply_to_with_range_of_head_2_and_cover_let
1567 relay.respond_events( 1638 relay.respond_events(
1568 client_id, 1639 client_id,
1569 &subscription_id, 1640 &subscription_id,
1570 &vec![generate_repo_ref_event(), get_pretend_proposal_root_event()], 1641 &vec![
1642 generate_repo_ref_event(),
1643 get_pretend_proposal_root_event(),
1644 generate_test_key_1_metadata_event("fred"),
1645 generate_test_key_1_relay_list_event(),
1646 ],
1571 )?; 1647 )?;
1572 Ok(()) 1648 Ok(())
1573 }), 1649 }),
@@ -1583,10 +1659,8 @@ mod root_proposal_specified_using_in_reply_to_with_range_of_head_2_and_cover_let
1583 &mut p, 1659 &mut p,
1584 vec![ 1660 vec![
1585 (" [my-relay] [repo-relay] ws://localhost:8055", true, ""), 1661 (" [my-relay] [repo-relay] ws://localhost:8055", true, ""),
1586 (" [my-relay] ws://localhost:8053", true, ""),
1587 (" [repo-relay] ws://localhost:8056", true, ""), 1662 (" [repo-relay] ws://localhost:8056", true, ""),
1588 (" [default] ws://localhost:8051", true, ""), 1663 (" [my-relay] ws://localhost:8053", true, ""),
1589 (" [default] ws://localhost:8052", true, ""),
1590 ], 1664 ],
1591 3, 1665 3,
1592 )?; 1666 )?;
@@ -1765,7 +1839,12 @@ mod in_reply_to_mentions_issue {
1765 relay.respond_events( 1839 relay.respond_events(
1766 client_id, 1840 client_id,
1767 &subscription_id, 1841 &subscription_id,
1768 &vec![generate_repo_ref_event(), get_pretend_issue_event()], 1842 &vec![
1843 generate_repo_ref_event(),
1844 get_pretend_issue_event(),
1845 generate_test_key_1_metadata_event("fred"),
1846 generate_test_key_1_relay_list_event(),
1847 ],
1769 )?; 1848 )?;
1770 Ok(()) 1849 Ok(())
1771 }), 1850 }),
@@ -1885,7 +1964,11 @@ mod in_reply_to_mentions_npub_and_nprofile_which_get_mentioned_in_proposal_root
1885 relay.respond_events( 1964 relay.respond_events(
1886 client_id, 1965 client_id,
1887 &subscription_id, 1966 &subscription_id,
1888 &vec![generate_repo_ref_event()], 1967 &vec![
1968 generate_repo_ref_event(),
1969 generate_test_key_1_metadata_event("fred"),
1970 generate_test_key_1_relay_list_event(),
1971 ],
1889 )?; 1972 )?;
1890 Ok(()) 1973 Ok(())
1891 }), 1974 }),
@@ -2037,7 +2120,11 @@ mod non_interactive_validation {
2037 relay.respond_events( 2120 relay.respond_events(
2038 client_id, 2121 client_id,
2039 &subscription_id, 2122 &subscription_id,
2040 &vec![generate_repo_ref_event()], 2123 &vec![
2124 generate_repo_ref_event(),
2125 generate_test_key_1_metadata_event("fred"),
2126 generate_test_key_1_relay_list_event(),
2127 ],
2041 )?; 2128 )?;
2042 Ok(()) 2129 Ok(())
2043 }), 2130 }),
generated by cgit v1.2.3 (git 2.39.1) at 2026-06-05 03:17:09 +0000