39 lines
1.4 KiB
Diff
39 lines
1.4 KiB
Diff
|
From 3bbb48b9e2569514caa88b9d67aa14d67a48432f Mon Sep 17 00:00:00 2001
|
||
|
|
From: Yuhang Wei <weiyuhang3@huawei.com>
|
||
|
|
Date: Tue, 20 Feb 2024 10:18:42 +0800
|
||
|
|
Subject: [PATCH 2/2] fix: partition info retrieval in get_partition_info
|
||
|
|
function
|
||
|
|
|
||
|
|
Signed-off-by: Yuhang Wei <weiyuhang3@huawei.com>
|
||
|
|
---
|
||
|
|
KubeOS-Rust/manager/src/utils/partition.rs | 7 ++++++-
|
||
|
|
1 file changed, 6 insertions(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/KubeOS-Rust/manager/src/utils/partition.rs b/KubeOS-Rust/manager/src/utils/partition.rs
|
||
|
|
index fcfa2d8b..799b4b35 100644
|
||
|
|
--- a/KubeOS-Rust/manager/src/utils/partition.rs
|
||
|
|
+++ b/KubeOS-Rust/manager/src/utils/partition.rs
|
||
|
|
@@ -50,7 +50,7 @@ pub fn get_partition_info<T: CommandExecutor>(executor: &T) -> Result<(Partition
|
||
|
|
}
|
||
|
|
}
|
||
|
|
}
|
||
|
|
- if cur_partition.device.is_empty() {
|
||
|
|
+ if cur_partition.menuentry.is_empty() {
|
||
|
|
bail!("Failed to get partition info, lsblk output: {}", lsblk);
|
||
|
|
}
|
||
|
|
Ok((cur_partition, next_partition))
|
||
|
|
@@ -108,5 +108,10 @@ mod tests {
|
||
|
|
mock.expect_run_command_with_output().times(1).returning(|_, _| Ok(command_output3.to_string()));
|
||
|
|
let res = get_partition_info(&mock);
|
||
|
|
assert!(res.is_err());
|
||
|
|
+
|
||
|
|
+ let command_output4 = "sda4 / ext4";
|
||
|
|
+ mock.expect_run_command_with_output().times(1).returning(|_, _| Ok(command_output4.to_string()));
|
||
|
|
+ let res = get_partition_info(&mock);
|
||
|
|
+ assert!(res.is_err());
|
||
|
|
}
|
||
|
|
}
|
||
|
|
--
|
||
|
|
2.34.1
|
||
|
|
|