From d3c22aedc490b7bf53e6273a8690f55102bd903d Mon Sep 17 00:00:00 2001 From: Zdenek Kabelac Date: Fri, 10 May 2024 22:04:06 +0200 Subject: [PATCH] tests: check vg fields with one command --- test/lib/check.sh | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/test/lib/check.sh b/test/lib/check.sh index 723070097..9230832aa 100644 --- a/test/lib/check.sh +++ b/test/lib/check.sh @@ -405,10 +405,11 @@ pvlv_counts() { local num_pvs=$2 local num_lvs=$3 local num_snaps=$4 - lvs -o+devices "$local_vg" - vg_field "$local_vg" pv_count "$num_pvs" - vg_field "$local_vg" lv_count "$num_lvs" - vg_field "$local_vg" snap_count "$num_snaps" + eval "$(vgs --noheadings --nameprefixes -o pv_count,lv_count,snap_count "$local_vg")" + [ "$LVM2_PV_COUNT" = "$num_pvs" ] && [ "$LVM2_LV_COUNT" = "$num_lvs" ] && [ "$LVM2_SNAP_COUNT" = "$num_snaps" ] || + die "vg_fields: vg=\"$local_vg\", field=\"pv_count,lv_count,snap_count\","\ + "actual=\"$LVM2_PV_COUNT $LVM2_LV_COUNT $LVM2_SNAP_COUNT\", "\ + "expected=\"$num_pvs $num_lvs $num_snaps\"" } # Compare md5 check generated from get dev_md5sum -- 2.43.5