oxidecomputer · jgallagher · Nov 21, 2024 · Nov 5, 2024 · Nov 19, 2024 · Nov 8, 2024
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/dev-tools/reconfigurator-cli/tests/output/cmd-example-stdout b/dev-tools/reconfigurator-cli/tests/output/cmd-example-stdout
diff --git a/live-tests/tests/test_nexus_add_remove.rs b/live-tests/tests/test_nexus_add_remove.rs
@@ -140,7 +140,8 @@ async fn test_nexus_add_remove(lc: &LiveTestContext) {
         &|builder: &mut BlueprintBuilder| {
             builder
                 .sled_expunge_zone(sled_id, new_zone.id())
-                .context("expunging zone")
+                .context("expunging zone")?;
+            Ok(())
         },
     )
     .await

diff --git a/nexus/db-queries/src/db/datastore/deployment.rs b/nexus/db-queries/src/db/datastore/deployment.rs
@@ -2325,15 +2325,18 @@ mod tests {
 
         // Ensure disks on our sled
         assert_eq!(
-            builder
-                .sled_ensure_disks(
-                    new_sled_id,
-                    &planning_input
-                        .sled_lookup(SledFilter::Commissioned, new_sled_id)
-                        .unwrap()
-                        .resources,
-                )
-                .unwrap(),
+            EnsureMultiple::from(
+                builder
+                    .sled_ensure_disks(
+                        new_sled_id,
+                        &planning_input
+                            .sled_lookup(SledFilter::Commissioned, new_sled_id)
+                            .unwrap()
+                            .resources,
+                    )
+                    .unwrap()
+                    .disks
+            ),
             EnsureMultiple::Changed {
                 added: 4,
                 updated: 0,