tyler
/
proxmox-backup
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

disks/zfs: fix test input and enforce check for config key 

we test for the config key in the API so it makes sense to have as
test here too. Actually it would be better if we'd have a expect
Value defined here and enforce that it matches, but better than
nothing.

Fix the input for test 1, where tabs got replaced by spaces, as else
it fails

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
Thomas Lamprecht 2021-03-01 17:36:15 +01:00
parent 2440eaa2df
commit d64226efee
1 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/tools/disks/zpool_status.rs
View File

@ -372,14 +372,20 @@ pub fn zpool_status(pool: &str) -> Result<Vec<(String, String)>, Error> {
#[cfg(test)] #[cfg(test)]
fn test_parse(output: &str) -> Result<(), Error> { fn test_parse(output: &str) -> Result<(), Error> {
let mut found_config = false;
for (k, v) in parse_zpool_status(&output)? { for (k, v) in parse_zpool_status(&output)? {
println!("{} => {}", k,v); println!("<{}> => '{}'", k, v);
if k == "config" { if k == "config" {
let vdev_list = parse_zpool_status_config_tree(&v)?; let vdev_list = parse_zpool_status_config_tree(&v)?;
let _tree = vdev_list_to_tree(&vdev_list); let _tree = vdev_list_to_tree(&vdev_list);
found_config = true; found_config = true;
} }
} }
if !found_config {
bail!("got zpool status without config key");
}
Ok(()) Ok(())
} }
@ -389,21 +395,21 @@ fn test_zpool_status_parser() -> Result<(), Error> {
let output = r###" pool: tank let output = r###" pool: tank
state: DEGRADED state: DEGRADED
status: One or more devices could not be opened. Sufficient replicas exist for status: One or more devices could not be opened. Sufficient replicas exist for
the pool to continue functioning in a degraded state. the pool to continue functioning in a degraded state.
action: Attach the missing device and online it using 'zpool online'. action: Attach the missing device and online it using 'zpool online'.
see: http://www.sun.com/msg/ZFS-8000-2Q see: http://www.sun.com/msg/ZFS-8000-2Q
scrub: none requested scrub: none requested
config: config:
NAME STATE READ WRITE CKSUM NAME STATE READ WRITE CKSUM
tank DEGRADED 0 0 0 tank DEGRADED 0 0 0
mirror-0 DEGRADED 0 0 0 mirror-0 DEGRADED 0 0 0
c1t0d0 ONLINE 0 0 0 c1t0d0 ONLINE 0 0 0
c1t2d0 ONLINE 0 0 0 c1t2d0 ONLINE 0 0 0
c1t1d0 UNAVAIL 0 0 0 cannot open c1t1d0 UNAVAIL 0 0 0 cannot open
mirror-1 DEGRADED 0 0 0 mirror-1 DEGRADED 0 0 0
tank1 DEGRADED 0 0 0 tank1 DEGRADED 0 0 0
tank2 DEGRADED 0 0 0 tank2 DEGRADED 0 0 0
errors: No known data errors errors: No known data errors
"###; "###;