shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2025-01-05 13:18:20 +03:00
Code Releases Activity

tests: add get_devs function

Browse Source 
Instead of rereading device list via cat - keep
the list in bash array. (Also solves problem
with spaces in device path)

Move usage of  "$path" out of lvm shell usage,
since we don't support such thing there...
This commit is contained in:
Zdenek Kabelac 2014-06-04 13:55:13 +02:00
parent 223bdc5eb2
commit 9196942312
2 changed files with 23 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
test/lib/utils.sh
View File

@ -186,6 +186,14 @@ kernel_at_least() {
test "$minor2" -ge "$3" 2>/dev/null || return 1 test "$minor2" -ge "$3" 2>/dev/null || return 1
} }
get_devs() {
local IFS=$IFS_NL
DEVICES=( $(<DEVICES) )
export DEVICES
# local DEVS=( $(<DEVICES) )
# eval "$1"'=("${DEVS[@]}")'
}
prepare_test_vars() { prepare_test_vars() {
vg="${PREFIX}vg" vg="${PREFIX}vg"
lv=LV lv=LV

31
test/shell/listings.sh
View File

@ -16,6 +16,7 @@
. lib/test . lib/test
aux prepare_devs 5 aux prepare_devs 5
get_devs
# Check there is no PV # Check there is no PV
pvscan | tee out pvscan | tee out
@ -28,21 +29,22 @@ pvcreate "$dev4"
pvcreate --metadatacopies 0 "$dev5" pvcreate --metadatacopies 0 "$dev5"
#COMM bz195276 -- pvs doesn't show PVs until a VG is created #COMM bz195276 -- pvs doesn't show PVs until a VG is created
test $(pvs --noheadings $(cat DEVICES) | wc -l) -eq 5 pvs --noheadings "${DEVICES[@]}"
test $(pvs --noheadings "${DEVICES[@]}" | wc -l) -eq 5
pvdisplay pvdisplay
#COMM pvs with segment attributes works even for orphans #COMM pvs with segment attributes works even for orphans
test $(pvs --noheadings -o seg_all,pv_all,lv_all,vg_all $(cat DEVICES) | wc -l) -eq 5 test $(pvs --noheadings -o seg_all,pv_all,lv_all,vg_all "${DEVICES[@]}" | wc -l) -eq 5
vgcreate $vg $(cat DEVICES) vgcreate $vg "${DEVICES[@]}"
check pv_field "$dev1" pv_uuid BADBEE-BAAD-BAAD-BAAD-BAAD-BAAD-BADBEE check pv_field "$dev1" pv_uuid BADBEE-BAAD-BAAD-BAAD-BAAD-BAAD-BADBEE
#COMM pvs and vgs report mda_count, mda_free (bz202886, bz247444) #COMM pvs and vgs report mda_count, mda_free (bz202886, bz247444)
pvs -o +pv_mda_count,pv_mda_free $(cat DEVICES) pvs -o +pv_mda_count,pv_mda_free "${DEVICES[@]}"
for I in "$dev2" "$dev3" "$dev5"; do for I in "$dev2" "$dev3" "$dev5"; do
check pv_field $I pv_mda_count 0 check pv_field "$I" pv_mda_count 0
check pv_field $I pv_mda_free 0 check pv_field "$I" pv_mda_free 0
done done
vgs -o +vg_mda_count,vg_mda_free $vg vgs -o +vg_mda_count,vg_mda_free $vg
check vg_field $vg vg_mda_count 2 check vg_field $vg vg_mda_count 2
@ -64,7 +66,7 @@ lvremove -f $vg/$lv2
lvcreate -aey -l2 --type mirror -m2 -n $lv3 $vg lvcreate -aey -l2 --type mirror -m2 -n $lv3 $vg
test $(lvs --noheadings $vg | wc -l) -eq 2 test $(lvs --noheadings $vg | wc -l) -eq 2
test $(lvs -a --noheadings $vg | wc -l) -eq 6 test $(lvs -a --noheadings $vg | wc -l) -eq 6
dmsetup ls|grep "$PREFIX"|grep -v "LVMTEST.*pv." dmsetup ls | grep "$PREFIX" | grep -v "LVMTEST.*pv."
lvcreate -l2 -s $vg/$lv3 lvcreate -l2 -s $vg/$lv3
lvcreate -l1 -s -n inval $vg/$lv3 lvcreate -l1 -s -n inval $vg/$lv3
@ -81,8 +83,8 @@ vgs -o pv_name,vg_name $vg
vgs -o all $vg vgs -o all $vg
#COMM pvdisplay --maps feature (bz149814) #COMM pvdisplay --maps feature (bz149814)
pvdisplay $(cat DEVICES) >out pvdisplay "${DEVICES[@]}" >out
pvdisplay --maps $(cat DEVICES) >out2 pvdisplay --maps "${DEVICES[@]}" >out2
not diff out out2 not diff out out2
aux disable_dev "$dev1" aux disable_dev "$dev1"
@ -108,8 +110,6 @@ invalid lvscan $vg
if aux have_readline; then if aux have_readline; then
cat <<EOF | lvm cat <<EOF | lvm
pvdisplay -c "$dev1"
pvdisplay -s "$dev1"
vgdisplay --units k $vg vgdisplay --units k $vg
vgdisplay -c $vg vgdisplay -c $vg
vgdisplay -C $vg vgdisplay -C $vg
@ -120,10 +120,6 @@ lvdisplay -C $vg
lvdisplay -m $vg lvdisplay -m $vg
lvdisplay --units g $vg lvdisplay --units g $vg
EOF EOF
for i in h b s k m g t p e H B S K M G T P E; do
echo pvdisplay --units $i "$dev1"
done | lvm
else else
pvdisplay -c "$dev1" pvdisplay -c "$dev1"
pvdisplay -s "$dev1" pvdisplay -s "$dev1"
@ -136,11 +132,14 @@ lvdisplay -c $vg
lvdisplay -C $vg lvdisplay -C $vg
lvdisplay -m $vg lvdisplay -m $vg
lvdisplay --units g $vg lvdisplay --units g $vg
fi
pvdisplay -c "$dev1"
pvdisplay -s "$dev1"
for i in h b s k m g t p e H B S K M G T P E; do for i in h b s k m g t p e H B S K M G T P E; do
pvdisplay --units $i "$dev1" pvdisplay --units $i "$dev1"
done done
fi
invalid lvdisplay -C -m $vg invalid lvdisplay -C -m $vg
invalid lvdisplay -c -m $vg invalid lvdisplay -c -m $vg