From ea09e03dbe4a1467aea84afa6d37885ad58b06fe Mon Sep 17 00:00:00 2001
From: Mike Zeller <mike@mikezeller.net>
Date: Mon, 11 Mar 2024 15:51:01 +0000
Subject: [PATCH] nit: mock_device to mock_disk

---
 sled-hardware/src/illumos/partitions.rs | 16 ++++++++--------
 test-utils/src/dev/mod.rs               |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/sled-hardware/src/illumos/partitions.rs b/sled-hardware/src/illumos/partitions.rs
index 54dcca7a9e..3b8e0af2ee 100644
--- a/sled-hardware/src/illumos/partitions.rs
+++ b/sled-hardware/src/illumos/partitions.rs
@@ -348,7 +348,7 @@ mod test {
     use crate::DiskPaths;
     use camino::Utf8PathBuf;
     use illumos_utils::zpool::MockZpool;
-    use omicron_test_utils::dev::{mock_device_identity, test_setup_log};
+    use omicron_test_utils::dev::{mock_disk_identity, test_setup_log};
     use std::path::Path;
 
     struct FakePartition {
@@ -384,7 +384,7 @@ mod test {
             &log,
             &DiskPaths { devfs_path, dev_path: None },
             DiskVariant::U2,
-            &mock_device_identity(),
+            &mock_disk_identity(),
         );
         match result {
             Err(PooledDiskError::CannotFormatMissingDevPath { .. }) => {}
@@ -418,7 +418,7 @@ mod test {
                 dev_path: Some(Utf8PathBuf::from(DEV_PATH)),
             },
             DiskVariant::U2,
-            &mock_device_identity(),
+            &mock_disk_identity(),
         )
         .expect("Should have succeeded partitioning disk");
 
@@ -443,7 +443,7 @@ mod test {
                 dev_path: Some(Utf8PathBuf::from(DEV_PATH))
             },
             DiskVariant::M2,
-            &mock_device_identity(),
+            &mock_disk_identity(),
         )
         .is_err());
 
@@ -481,7 +481,7 @@ mod test {
                 dev_path: Some(Utf8PathBuf::from(DEV_PATH)),
             },
             DiskVariant::U2,
-            &mock_device_identity(),
+            &mock_disk_identity(),
         )
         .expect("Should be able to parse disk");
 
@@ -524,7 +524,7 @@ mod test {
                 dev_path: Some(Utf8PathBuf::from(DEV_PATH)),
             },
             DiskVariant::M2,
-            &mock_device_identity(),
+            &mock_disk_identity(),
         )
         .expect("Should be able to parse disk");
 
@@ -564,7 +564,7 @@ mod test {
                     dev_path: Some(Utf8PathBuf::from(DEV_PATH)),
                 },
                 DiskVariant::M2,
-                &mock_device_identity(),
+                &mock_disk_identity(),
             )
             .expect_err("Should have failed parsing empty GPT"),
             PooledDiskError::BadPartitionLayout { .. }
@@ -590,7 +590,7 @@ mod test {
                     dev_path: Some(Utf8PathBuf::from(DEV_PATH)),
                 },
                 DiskVariant::U2,
-                &mock_device_identity(),
+                &mock_disk_identity(),
             )
             .expect_err("Should have failed parsing empty GPT"),
             PooledDiskError::BadPartitionLayout { .. }
diff --git a/test-utils/src/dev/mod.rs b/test-utils/src/dev/mod.rs
index f18e3eade1..705d6ff08c 100644
--- a/test-utils/src/dev/mod.rs
+++ b/test-utils/src/dev/mod.rs
@@ -149,7 +149,7 @@ pub fn process_running(pid: u32) -> bool {
 
 /// Returns a DiskIdentity that can be passed to ensure_partition_layout when
 /// not operating on a real disk.
-pub fn mock_device_identity() -> DiskIdentity {
+pub fn mock_disk_identity() -> DiskIdentity {
     DiskIdentity {
         vendor: "MockVendor".to_string(),
         serial: "MOCKSERIAL".to_string(),