fixes from merging main

oxidecomputer · Feb 26, 2024 · 16d749f · 16d749f
1 parent f264f51
commit 16d749f
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/nexus/blueprint-execution/src/datasets.rs b/nexus/blueprint-execution/src/datasets.rs
@@ -185,7 +185,11 @@ mod tests {
                 },
                 rack_id,
             );
-            datastore.sled_upsert(sled).await.expect("failed to upsert sled");
+            datastore
+                .sled_upsert(sled)
+                .await
+                .expect("failed to upsert sled")
+                .unwrap();
 
             for zone in &config.zones.zones {
                 let OmicronZoneType::Crucible { dataset, .. } = &zone.zone_type

diff --git a/nexus/db-queries/src/db/datastore/dataset.rs b/nexus/db-queries/src/db/datastore/dataset.rs
@@ -190,7 +190,7 @@ impl DataStore {
 #[cfg(test)]
 mod test {
     use super::*;
-    use crate::db::datastore::datastore_test;
+    use crate::db::datastore::test_utils::datastore_test;
     use nexus_db_model::SledBaseboard;
     use nexus_db_model::SledSystemHardware;
     use nexus_db_model::SledUpdate;
@@ -228,7 +228,11 @@ mod test {
             },
             Uuid::new_v4(),
         );
-        datastore.sled_upsert(sled).await.expect("failed to upsert sled");
+        datastore
+            .sled_upsert(sled)
+            .await
+            .expect("failed to upsert sled")
+            .unwrap();
 
         // Create a fake zpool that backs our fake datasets.
         let zpool_id = Uuid::new_v4();