upleb.uk

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

summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/lib/client.rs10
-rw-r--r--test_utils/src/relay.rs9
2 files changed, 14 insertions, 5 deletions
diff --git a/src/lib/client.rs b/src/lib/client.rs
index 12df19e..fa08252 100644
--- a/src/lib/client.rs
+++ b/src/lib/client.rs
@@ -2454,7 +2454,7 @@ pub async fn send_events(
2454 2454
2455 let verbose = is_verbose(); 2455 let verbose = is_verbose();
2456 let is_test = std::env::var("NGITTEST").is_ok(); 2456 let is_test = std::env::var("NGITTEST").is_ok();
2457 let use_concise = !verbose && !is_test && !silent && animate; 2457 let use_concise = !is_test || (!verbose && !silent && animate);
2458 2458
2459 // Set up the two-MultiProgress pattern (same as fetch_all): 2459 // Set up the two-MultiProgress pattern (same as fetch_all):
2460 // 1. A spinner MultiProgress shown immediately (concise mode only) 2460 // 1. A spinner MultiProgress shown immediately (concise mode only)
@@ -2477,7 +2477,7 @@ pub async fn send_events(
2477 None 2477 None
2478 }; 2478 };
2479 2479
2480 let m = if silent || is_test || use_concise { 2480 let m = if silent || !is_test || use_concise {
2481 MultiProgress::with_draw_target(ProgressDrawTarget::hidden()) 2481 MultiProgress::with_draw_target(ProgressDrawTarget::hidden())
2482 } else { 2482 } else {
2483 MultiProgress::new() 2483 MultiProgress::new()
@@ -2488,9 +2488,9 @@ pub async fn send_events(
2488 let heading_bar = { 2488 let heading_bar = {
2489 let bar = 2489 let bar =
2490 m.add(ProgressBar::new(0).with_style(ProgressStyle::with_template("{msg}").unwrap())); 2490 m.add(ProgressBar::new(0).with_style(ProgressStyle::with_template("{msg}").unwrap()));
2491 // if !use_concise { 2491 if !is_test {
2492 bar.set_message("Publishing to nostr relays..."); 2492 bar.set_message("Publishing to nostr relays...");
2493 // } 2493 }
2494 Some(bar) 2494 Some(bar)
2495 }; 2495 };
2496 2496
diff --git a/test_utils/src/relay.rs b/test_utils/src/relay.rs
index 9582bfd..3419271 100644
--- a/test_utils/src/relay.rs
+++ b/test_utils/src/relay.rs
@@ -267,6 +267,15 @@ pub fn expect_send_with_progress(
267 break; 267 break;
268 } 268 }
269 } 269 }
270 let mut s = String::new();
271 loop {
272 s.push_str(&p.expect_eventually(&last_relay_outcome)?);
273 s.push_str(&last_relay_outcome);
274 if relays.iter().all(|r| s.contains(&outcome_message(r))) {
275 // all responses have been received with correct outcome
276 break;
277 }
278 }
270 Ok(()) 279 Ok(())
271} 280}
272 281