From c6efa702a969cfbf74d1080720c1b765dffc7185 Mon Sep 17 00:00:00 2001
From: zhangxingrong <zhangxingrong@uniontech.com>
Date: Thu, 6 Jun 2024 21:01:50 +0800
Subject: [PATCH] add test for syscare-common disk.rs

---
 ...-add-test-for-syscare-common-disk.rs.patch | 68 +++++++++++++++++++
 syscare.spec                                  |  6 +-
 2 files changed, 73 insertions(+), 1 deletion(-)
 create mode 100644 0025-add-test-for-syscare-common-disk.rs.patch

diff --git a/0025-add-test-for-syscare-common-disk.rs.patch b/0025-add-test-for-syscare-common-disk.rs.patch
new file mode 100644
index 0000000..c294463
--- /dev/null
+++ b/0025-add-test-for-syscare-common-disk.rs.patch
@@ -0,0 +1,68 @@
+From bf92789fe482386c2a3b2ce2f6df4d6af58348c7 Mon Sep 17 00:00:00 2001
+From: zhangxingrong <zhangxingrong@uniontech.com>
+Date: Thu, 6 Jun 2024 20:58:54 +0800
+Subject: [PATCH] add test for syscare-common disk.rs
+
+---
+ syscare-common/src/os/disk.rs | 16 ++++++++++++++++
+ syscare-common/src/os/grub.rs | 23 +++++++++++++++++++++++
+ 2 files changed, 39 insertions(+)
+
+diff --git a/syscare-common/src/os/disk.rs b/syscare-common/src/os/disk.rs
+index 7ace804..f6fb8d9 100644
+--- a/syscare-common/src/os/disk.rs
++++ b/syscare-common/src/os/disk.rs
+@@ -62,3 +62,19 @@ pub fn find_by_partuuid<S: AsRef<OsStr>>(name: S) -> std::io::Result<PathBuf> {
+ pub fn find_by_path<S: AsRef<OsStr>>(name: S) -> std::io::Result<PathBuf> {
+     find_disk("/dev/disk/by-path", name)
+ }
++
++#[cfg(test)]
++use crate::util::ext_cmd::{ExternCommand,ExternCommandArgs};
++#[test]
++fn test() {
++    let get_uuid = ExternCommand::new("ls");
++    let get_uuid_args = ExternCommandArgs::new().arg("/dev/disk/by-uuid");
++    if let Ok(result_uuid) = get_uuid.execvp(get_uuid_args).unwrap().stdout().to_os_string().into_string() {
++       let uuids: Vec<&str> = result_uuid.split_whitespace().collect();
++       for uuid in uuids {
++         let disk_by_uuid = find_by_uuid(uuid);
++         println!("disk_by_uuid:  {}", disk_by_uuid.is_ok());
++         assert!(disk_by_uuid.is_ok());
++       }
++    }
++}
+diff --git a/syscare-common/src/os/grub.rs b/syscare-common/src/os/grub.rs
+index 54299d8..9f7e08d 100644
+--- a/syscare-common/src/os/grub.rs
++++ b/syscare-common/src/os/grub.rs
+@@ -310,3 +310,26 @@ pub fn get_boot_entry() -> std::io::Result<GrubMenuEntry> {
+         format!("Cannot find grub default entry {:?}", default_entry_name),
+     ))
+ }
++
++#[test]
++fn test_for_grub_config() {
++    let grub_type = get_boot_type();
++    let grub_path = get_grub_path(grub_type);
++    let config = find_grub_config(grub_path);
++    assert!(config.is_ok());
++}
++
++#[test]
++fn test_for_menu_entries() {
++    let grub_type = get_boot_type();
++    let grub_path = get_grub_path(grub_type);
++    let entries = read_menu_entries(grub_path);
++    assert!(entries.is_ok());
++}
++#[test]
++fn test_for_grub_env(){
++    let grub_type = get_boot_type();
++    let grub_path = get_grub_path(grub_type);
++    let grub_env = read_grub_env(grub_path);
++    assert!(grub_env.is_ok());
++}
+-- 
+2.43.0
+
diff --git a/syscare.spec b/syscare.spec
index 3d3f623..686c66b 100644
--- a/syscare.spec
+++ b/syscare.spec
@@ -11,7 +11,7 @@
 ############################################
 Name:          syscare
 Version:       1.2.1
-Release:       8
+Release:       9
 Summary:       System hot-fix service
 License:       MulanPSL-2.0 and GPL-2.0-only
 URL:           https://gitee.com/openeuler/syscare
@@ -41,6 +41,7 @@ Patch0021:     0021-upatch-diff-only-check-changed-file-symbols.patch
 Patch0022:     0022-upatch-diff-remove-rela-check-while-build-rebuilding.patch
 Patch0023:     0023-syscared-fix-apply-kernel-module-patch-failure-issue.patch
 Patch0024:     0024-syscare-build-fix-build-oot-module-failure-issue.patch
+Patch0025:     0025-add-test-for-syscare-common-disk.rs.patch
 
 BuildRequires: cmake >= 3.14 make
 BuildRequires: rust >= 1.51 cargo >= 1.51
@@ -192,6 +193,9 @@ fi
 ################ Change log ################
 ############################################
 %changelog
+* Thu Jun 06 2024 zhangxingrong <zhangxingrong@uniontech.com> - 1.2.1-9
+- add test for syscare-common disk.rs 
+
 * Mon May 20 2024 ningyu<ningyu9@huawei.com> - 1.2.1-8
 - syscared: fix apply kernel module patch failure issue
 - syscare-build: fix build oot module failure issue
-- 
Gitee