shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2024-12-22 17:35:59 +03:00
Code Releases Activity

tests: remove -cn option from some commands

Browse Source
This commit is contained in:
David Teigland 2018-06-06 14:04:19 -05:00 committed by Joe Thornber
parent da30b4a786
commit 229582c97c
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/shell/vgcfgbackup-lvm1.sh
View File

@ -28,7 +28,7 @@ aux lvmconf "backup/backup = 0"
# vgcfgbackup correctly stores metadata LVM1 with missing PVs # vgcfgbackup correctly stores metadata LVM1 with missing PVs
pvcreate -M1 "${DEVICES[@]}" pvcreate -M1 "${DEVICES[@]}"
vgcreate $SHARED -M1 -c n "$vg" "${DEVICES[@]}" vgcreate $SHARED -M1 "$vg" "${DEVICES[@]}"
lvcreate -l1 -n $lv1 $vg "$dev1" lvcreate -l1 -n $lv1 $vg "$dev1"
pvremove -ff -y "$dev2" pvremove -ff -y "$dev2"
not lvcreate -l1 -n $lv1 $vg "$dev3" not lvcreate -l1 -n $lv1 $vg "$dev3"

8
test/shell/vgchange-usage.sh
View File

@ -101,7 +101,7 @@ vgremove -ff $vg
test -n "$LVM_TEST_LVMLOCKD" && exit 0 test -n "$LVM_TEST_LVMLOCKD" && exit 0
# set cluster bit # set cluster bit
vgcreate -cn $vg "$dev1" "$dev2" "$dev3" vgcreate $vg "$dev1" "$dev2" "$dev3"
# check prompt to change cluster bit without giving explicit vg name # check prompt to change cluster bit without giving explicit vg name
fail vgchange -cy 2>&1 | tee out fail vgchange -cy 2>&1 | tee out
grep "y/n" out grep "y/n" out
@ -121,10 +121,10 @@ if test -e LOCAL_CLVMD ; then
# check we do not support conversion of just locally active LVs # check we do not support conversion of just locally active LVs
lvchange -an $vg lvchange -an $vg
lvchange -ay $vg lvchange -ay $vg
not vgchange -cn $vg not vgchange $vg
lvchange -an $vg lvchange -an $vg
lvchange -aey $vg lvchange -aey $vg
vgchange -cn $vg vgchange $vg
else else
# no clvmd is running # no clvmd is running
fail vgchange -cy $vg fail vgchange -cy $vg
@ -136,7 +136,7 @@ else
vgs --ignoreskippedcluster $vg 2>&1 | tee out vgs --ignoreskippedcluster $vg 2>&1 | tee out
not grep "Skipping clustered volume group" out not grep "Skipping clustered volume group" out
# reset back to non-clustered VG with disabled locking # reset back to non-clustered VG with disabled locking
vgchange -cn $vg --config 'global{locking_type=0}' $vg vgchange $vg --config 'global{locking_type=0}' $vg
fi fi
check vg_attr_bit cluster $vg "-" check vg_attr_bit cluster $vg "-"

6
test/shell/vgsplit-usage.sh
View File

@ -96,9 +96,9 @@ grep "Volume group \"$vg2\" exists, but new VG option specified" err
vgremove $vg1 $vg2 vgremove $vg1 $vg2
# vgsplit rejects split because clustered given with existing vg # vgsplit rejects split because clustered given with existing vg
vgcreate -M$mdatype --clustered n $vg1 "$dev1" "$dev2" vgcreate -M$mdatype $vg1 "$dev1" "$dev2"
vgcreate -M$mdatype --clustered n $vg2 "$dev3" "$dev4" vgcreate -M$mdatype $vg2 "$dev3" "$dev4"
not vgsplit --clustered n $vg1 $vg2 "$dev1" 2>err not vgsplit $vg1 $vg2 "$dev1" 2>err
grep "Volume group \"$vg2\" exists, but new VG option specified" err grep "Volume group \"$vg2\" exists, but new VG option specified" err
vgremove $vg1 $vg2 vgremove $vg1 $vg2