From 2350376276f215c54f182961679b8df2a30d58a0 Mon Sep 17 00:00:00 2001 From: Zeke Foppa Date: Wed, 25 Feb 2026 10:18:37 -0800 Subject: [PATCH 1/2] [bfops/confirmed]: Smoketest subscribe properly respects new confirmed behavior --- crates/smoketests/src/lib.rs | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/crates/smoketests/src/lib.rs b/crates/smoketests/src/lib.rs index d1cf7b16667..ef47c322e73 100644 --- a/crates/smoketests/src/lib.rs +++ b/crates/smoketests/src/lib.rs @@ -1317,16 +1317,16 @@ log = "0.4" /// Returns the updates as JSON values. /// For tests that need to perform actions while subscribed, use `subscribe_background` instead. pub fn subscribe(&self, queries: &[&str], n: usize) -> Result> { - self.subscribe_opts(queries, n, false) + self.subscribe_opts(queries, n, None) } /// Starts a subscription with --confirmed flag and waits for N updates. pub fn subscribe_confirmed(&self, queries: &[&str], n: usize) -> Result> { - self.subscribe_opts(queries, n, true) + self.subscribe_opts(queries, n, Some(true)) } /// Internal helper for subscribe with options. - fn subscribe_opts(&self, queries: &[&str], n: usize, confirmed: bool) -> Result> { + fn subscribe_opts(&self, queries: &[&str], n: usize, confirmed: Option) -> Result> { let start = Instant::now(); let identity = self.database_identity.as_ref().context("No database published")?; let config_path_str = self.config_path.to_str().unwrap(); @@ -1347,8 +1347,9 @@ log = "0.4" let n_str = n.to_string(); args.push(&n_str); args.push("--print-initial-update"); - if confirmed { - args.push("--confirmed"); + if let Some(confirmed) = confirmed { + args.push("--confirmed".to_string()); + args.push(confirmed.to_string()); } args.push("--"); cmd.args(&args) From 0d2297833e90dab75508a16963b1e179112c4043 Mon Sep 17 00:00:00 2001 From: Zeke Foppa Date: Wed, 25 Feb 2026 10:24:34 -0800 Subject: [PATCH 2/2] [bfops/confirmed]: fix --- crates/smoketests/src/lib.rs | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/crates/smoketests/src/lib.rs b/crates/smoketests/src/lib.rs index ef47c322e73..fd48b345a56 100644 --- a/crates/smoketests/src/lib.rs +++ b/crates/smoketests/src/lib.rs @@ -1334,24 +1334,24 @@ log = "0.4" let cli_path = ensure_binaries_built(); let mut cmd = Command::new(&cli_path); let mut args = vec![ - "--config-path", - config_path_str, - "subscribe", - "--server", - &self.server_url, - identity, - "-t", - "30", - "-n", + "--config-path".to_string(), + config_path_str.to_string(), + "subscribe".to_string(), + "--server".to_string(), + self.server_url.to_string(), + identity.to_string(), + "-t".to_string(), + "30".to_string(), + "-n".to_string(), ]; let n_str = n.to_string(); - args.push(&n_str); - args.push("--print-initial-update"); + args.push(n_str); + args.push("--print-initial-update".to_string()); if let Some(confirmed) = confirmed { args.push("--confirmed".to_string()); args.push(confirmed.to_string()); } - args.push("--"); + args.push("--".to_string()); cmd.args(&args) .args(queries) .stdout(Stdio::piped())