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

Fix lvm tool exit code display in some tests.

Browse Source
This commit is contained in:
Dave Wysochanski 2008-04-10 01:06:48 +00:00
parent d37beb92db
commit ec49b413c6
6 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/t-lvcreate-usage.sh
View File

@ -39,7 +39,7 @@ lv=lvcreate-usage-$$
test_expect_success \ test_expect_success \
'lvcreate rejects a negative stripe_size' \ 'lvcreate rejects a negative stripe_size' \
'lvcreate -L 64M -n $lv -i2 --stripesize -4 $vg 2>err; 'lvcreate -L 64M -n $lv -i2 --stripesize -4 $vg 2>err;
status=$?; echo status=$?; test $status = 3 && status=$?; echo status=$status; test $status = 3 &&
grep "^ Negative stripesize is invalid\$" err' grep "^ Negative stripesize is invalid\$" err'
test_expect_success \ test_expect_success \

2
test/t-mdata-strings.sh
View File

@ -42,7 +42,7 @@ test_expect_success \
'no parse errors and VG really exists' \ 'no parse errors and VG really exists' \
'vgs 2>err && 'vgs 2>err &&
grep "Parse error" err; grep "Parse error" err;
status=$?; echo status=$?; test $status -ne 0 && status=$?; echo status=$status; test $status -ne 0 &&
vgs $vg' vgs $vg'
test_done test_done

12
test/t-vgcreate-usage.sh
View File

@ -51,32 +51,32 @@ test_expect_success \
test_expect_success \ test_expect_success \
'vgcreate rejects a zero physical extent size' \ 'vgcreate rejects a zero physical extent size' \
'vgcreate --physicalextentsize 0 $vg $d1 $d2 2>err; 'vgcreate --physicalextentsize 0 $vg $d1 $d2 2>err;
status=$?; echo status=$?; test $status = 3 && status=$?; echo status=$status; test $status = 3 &&
grep "^ Physical extent size may not be zero\$" err' grep "^ Physical extent size may not be zero\$" err'
test_expect_success \ test_expect_success \
'vgcreate rejects "inherit" allocation policy' \ 'vgcreate rejects "inherit" allocation policy' \
'vgcreate --alloc inherit $vg $d1 $d2 2>err; 'vgcreate --alloc inherit $vg $d1 $d2 2>err;
status=$?; echo status=$?; test $status = 3 && status=$?; echo status=$status; test $status = 3 &&
grep "^ Volume Group allocation policy cannot inherit from anything\$" err' grep "^ Volume Group allocation policy cannot inherit from anything\$" err'
test_expect_success \ test_expect_success \
'vgcreate rejects vgname "."' \ 'vgcreate rejects vgname "."' \
'vg=.; vgcreate $vg $d1 $d2 2>err; 'vg=.; vgcreate $vg $d1 $d2 2>err;
status=$?; echo status=$?; test $status = 3 && status=$?; echo status=$status; test $status = 3 &&
grep "New volume group name \"$vg\" is invalid\$" err' grep "New volume group name \"$vg\" is invalid\$" err'
test_expect_success \ test_expect_success \
'vgcreate rejects vgname greater than 128 characters' \ 'vgcreate rejects vgname greater than 128 characters' \
'vginvalid=thisnameisridiculouslylongtotestvalidationcodecheckingmaximumsizethisiswhathappenswhenprogrammersgetboredandorarenotcreativedonttrythisathome; 'vginvalid=thisnameisridiculouslylongtotestvalidationcodecheckingmaximumsizethisiswhathappenswhenprogrammersgetboredandorarenotcreativedonttrythisathome;
vgcreate $vginvalid $d1 $d2 2>err; vgcreate $vginvalid $d1 $d2 2>err;
status=$?; echo status=$?; test $status = 3 && status=$?; echo status=$status; test $status = 3 &&
grep "New volume group name \"$vginvalid\" is invalid\$" err' grep "New volume group name \"$vginvalid\" is invalid\$" err'
test_expect_success \ test_expect_success \
'vgcreate rejects already existing vgname "/tmp/$vg"' \ 'vgcreate rejects already existing vgname "/tmp/$vg"' \
'touch /tmp/$vg; vgcreate $vg $d1 $d2 2>err; 'touch /tmp/$vg; vgcreate $vg $d1 $d2 2>err;
status=$?; echo status=$?; test $status = 3 && status=$?; echo status=$status; test $status = 3 &&
grep "New volume group name \"$vg\" is invalid\$" err' grep "New volume group name \"$vg\" is invalid\$" err'
# FIXME: Not sure why this fails # FIXME: Not sure why this fails
@ -84,7 +84,7 @@ test_expect_success \
# 'vgcreate rejects MaxLogicalVolumes > 255' \ # 'vgcreate rejects MaxLogicalVolumes > 255' \
# 'vgcreate --metadatatype 1 --maxlogicalvolumes 1024 $vg $d1 $d2 2>err; # 'vgcreate --metadatatype 1 --maxlogicalvolumes 1024 $vg $d1 $d2 2>err;
# cp err save; # cp err save;
# status=$?; echo status=$?; test $status = 3 && # status=$?; echo status=$status; test $status = 3 &&
# grep "^ Number of volumes may not exceed 255\$" err' # grep "^ Number of volumes may not exceed 255\$" err'
test_done test_done

10
test/t-vgmerge-usage.sh
View File

@ -45,7 +45,7 @@ test_expect_success \
'vgcreate $vg1 $d1 $d2 && 'vgcreate $vg1 $d1 $d2 &&
vgcreate $vg2 $d3 $d4 && vgcreate $vg2 $d3 $d4 &&
vgmerge $vg1 $vg1 2>err; vgmerge $vg1 $vg1 2>err;
status=$?; echo status=$?; test $status = 5 && status=$?; echo status=$status; test $status = 5 &&
grep "^ Duplicate volume group name \"$vg1\"\$" err && grep "^ Duplicate volume group name \"$vg1\"\$" err &&
vgremove $vg2 && vgremove $vg2 &&
vgremove $vg1' vgremove $vg1'
@ -55,7 +55,7 @@ test_expect_success \
'vgcreate --physicalextentsize 4M $vg1 $d1 $d2 && 'vgcreate --physicalextentsize 4M $vg1 $d1 $d2 &&
vgcreate --physicalextentsize 8M $vg2 $d3 $d4 && vgcreate --physicalextentsize 8M $vg2 $d3 $d4 &&
vgmerge $vg1 $vg2 2>err; vgmerge $vg1 $vg2 2>err;
status=$?; echo status=$?; test $status = 5 && status=$?; echo status=$status; test $status = 5 &&
grep "^ Extent sizes differ" err && grep "^ Extent sizes differ" err &&
vgremove $vg2 && vgremove $vg2 &&
vgremove $vg1' vgremove $vg1'
@ -65,7 +65,7 @@ test_expect_success \
'vgcreate --maxphysicalvolumes 2 $vg1 $d1 $d2 && 'vgcreate --maxphysicalvolumes 2 $vg1 $d1 $d2 &&
vgcreate --maxphysicalvolumes 2 $vg2 $d3 $d4 && vgcreate --maxphysicalvolumes 2 $vg2 $d3 $d4 &&
vgmerge $vg1 $vg2 2>err; vgmerge $vg1 $vg2 2>err;
status=$?; echo status=$?; test $status = 5 && status=$?; echo status=$status; test $status = 5 &&
grep "^ Maximum number of physical volumes (2) exceeded" err && grep "^ Maximum number of physical volumes (2) exceeded" err &&
vgremove $vg2 && vgremove $vg2 &&
vgremove $vg1' vgremove $vg1'
@ -76,7 +76,7 @@ test_expect_success \
vgcreate $vg2 $d3 $d4 && vgcreate $vg2 $d3 $d4 &&
lvcreate -l 4 -n lv1 $vg2 && lvcreate -l 4 -n lv1 $vg2 &&
vgmerge $vg1 $vg2 2>err; vgmerge $vg1 $vg2 2>err;
status=$?; echo status=$?; test $status = 5 && status=$?; echo status=$status; test $status = 5 &&
grep "^ Logical volumes in \"$vg2\" must be inactive\$" err && grep "^ Logical volumes in \"$vg2\" must be inactive\$" err &&
vgremove -f $vg2 && vgremove -f $vg2 &&
vgremove -f $vg1' vgremove -f $vg1'
@ -91,7 +91,7 @@ test_expect_success \
vgchange -an $vg1 && vgchange -an $vg1 &&
vgchange -an $vg2 && vgchange -an $vg2 &&
vgmerge $vg1 $vg2 2>err; vgmerge $vg1 $vg2 2>err;
status=$?; echo status=$?; test $status = 5 && status=$?; echo status=$status; test $status = 5 &&
grep "^ Maximum number of logical volumes (2) exceeded" err && grep "^ Maximum number of logical volumes (2) exceeded" err &&
vgremove -f $vg2 && vgremove -f $vg2 &&
vgremove -f $vg1' vgremove -f $vg1'

10
test/t-vgsplit-operation.sh
View File

@ -222,7 +222,7 @@ test_expect_success \
lvcreate -l 4 -n $lv3 -i 2 $vg1 $d3 $d4 && lvcreate -l 4 -n $lv3 -i 2 $vg1 $d3 $d4 &&
vgchange -an $vg1 && vgchange -an $vg1 &&
vgsplit -n $lv1 $vg1 $vg2; vgsplit -n $lv1 $vg1 $vg2;
status=$?; echo status=$?; test $status = 5 && status=$?; echo status=$status; test $status = 5 &&
vgremove -ff $vg1' vgremove -ff $vg1'
test_expect_success \ test_expect_success \
@ -234,7 +234,7 @@ test_expect_success \
vg_validate_pvlv_counts_ $vg1 4 1 2 && vg_validate_pvlv_counts_ $vg1 4 1 2 &&
vgchange -an $vg1 && vgchange -an $vg1 &&
vgsplit -n $lv1 $vg1 $vg2; vgsplit -n $lv1 $vg1 $vg2;
status=$?; echo status=$?; test $status = 5 && status=$?; echo status=$status; test $status = 5 &&
lvremove -f $vg1/$lv2 && lvremove -f $vg1/$lv2 &&
lvremove -f $vg1/$lv3 && lvremove -f $vg1/$lv3 &&
lvremove -f $vg1/$lv1 && lvremove -f $vg1/$lv1 &&
@ -249,7 +249,7 @@ test_expect_success \
vg_validate_pvlv_counts_ $vg1 4 1 2 && vg_validate_pvlv_counts_ $vg1 4 1 2 &&
vgchange -an $vg1 && vgchange -an $vg1 &&
vgsplit -n $lv2 $vg1 $vg2; vgsplit -n $lv2 $vg1 $vg2;
status=$?; echo status=$?; test $status = 5 && status=$?; echo status=$status; test $status = 5 &&
lvremove -f $vg1/$lv2 && lvremove -f $vg1/$lv2 &&
lvremove -f $vg1/$lv3 && lvremove -f $vg1/$lv3 &&
lvremove -f $vg1/$lv1 && lvremove -f $vg1/$lv1 &&
@ -262,7 +262,7 @@ test_expect_success \
vg_validate_pvlv_counts_ $vg1 4 4 0 && vg_validate_pvlv_counts_ $vg1 4 4 0 &&
vgchange -an $vg1 && vgchange -an $vg1 &&
vgsplit $vg1 $vg2 $d2 && vgsplit $vg1 $vg2 $d2 &&
status=$?; echo status=$?; test $status = 5 && status=$?; echo status=$status; test $status = 5 &&
vgremove -ff $vg1' vgremove -ff $vg1'
test_expect_success \ test_expect_success \
@ -273,7 +273,7 @@ test_expect_success \
vg_validate_pvlv_counts_ $vg1 4 5 0 && vg_validate_pvlv_counts_ $vg1 4 5 0 &&
vgchange -an $vg1 && vgchange -an $vg1 &&
vgsplit -n $lv2 $vg1 $vg2 2>err; vgsplit -n $lv2 $vg1 $vg2 2>err;
status=$?; echo status=$?; test $status = 5 && status=$?; echo status=$status; test $status = 5 &&
vgremove -ff $vg1' vgremove -ff $vg1'

22
test/t-vgsplit-usage.sh
View File

@ -43,7 +43,7 @@ test_expect_success \
'vgsplit accepts new vg as destination of split' \ 'vgsplit accepts new vg as destination of split' \
'vgcreate $vg1 $d1 $d2 && 'vgcreate $vg1 $d1 $d2 &&
vgsplit $vg1 $vg2 $d1 1>err; vgsplit $vg1 $vg2 $d1 1>err;
status=$?; echo status=$?; test $status = 0 && status=$?; echo status=$status; test $status = 0 &&
grep "New volume group \"$vg2\" successfully split from \"$vg1\"" err && grep "New volume group \"$vg2\" successfully split from \"$vg1\"" err &&
vgremove $vg1 && vgremove $vg1 &&
vgremove $vg2' vgremove $vg2'
@ -53,7 +53,7 @@ test_expect_success \
'vgcreate $vg1 $d1 $d2 && 'vgcreate $vg1 $d1 $d2 &&
vgcreate $vg2 $d3 $d4 && vgcreate $vg2 $d3 $d4 &&
vgsplit $vg1 $vg2 $d1 1>err; vgsplit $vg1 $vg2 $d1 1>err;
status=$?; echo status=$?; test $status = 0 && status=$?; echo status=$status; test $status = 0 &&
grep "Existing volume group \"$vg2\" successfully split from \"$vg1\"" err && grep "Existing volume group \"$vg2\" successfully split from \"$vg1\"" err &&
vgremove $vg1 && vgremove $vg1 &&
vgremove $vg2' vgremove $vg2'
@ -79,7 +79,7 @@ test_expect_success \
'vgcreate --maxphysicalvolumes 2 $vg1 $d1 $d2 && 'vgcreate --maxphysicalvolumes 2 $vg1 $d1 $d2 &&
vgcreate --maxphysicalvolumes 2 $vg2 $d3 $d4 && vgcreate --maxphysicalvolumes 2 $vg2 $d3 $d4 &&
vgsplit $vg1 $vg2 $d1 2>err; vgsplit $vg1 $vg2 $d1 2>err;
status=$?; echo status=$?; test $status = 5 && status=$?; echo status=$status; test $status = 5 &&
grep "^ Maximum number of physical volumes (2) exceeded" err && grep "^ Maximum number of physical volumes (2) exceeded" err &&
vgremove $vg2 && vgremove $vg2 &&
vgremove $vg1' vgremove $vg1'
@ -89,7 +89,7 @@ test_expect_success \
'vgcreate --maxphysicalvolumes 2 $vg1 $d1 $d2 && 'vgcreate --maxphysicalvolumes 2 $vg1 $d1 $d2 &&
vgcreate --maxphysicalvolumes 2 $vg2 $d3 $d4 && vgcreate --maxphysicalvolumes 2 $vg2 $d3 $d4 &&
vgsplit --maxphysicalvolumes 2 $vg1 $vg2 $d1 2>err; vgsplit --maxphysicalvolumes 2 $vg1 $vg2 $d1 2>err;
status=$?; echo status=$?; test $status = 5 && status=$?; echo status=$status; test $status = 5 &&
grep "^ Volume group \"$vg2\" exists, but new VG option specified" err && grep "^ Volume group \"$vg2\" exists, but new VG option specified" err &&
vgremove $vg2 && vgremove $vg2 &&
vgremove $vg1' vgremove $vg1'
@ -99,7 +99,7 @@ test_expect_success \
'vgcreate --maxlogicalvolumes 2 $vg1 $d1 $d2 && 'vgcreate --maxlogicalvolumes 2 $vg1 $d1 $d2 &&
vgcreate --maxlogicalvolumes 2 $vg2 $d3 $d4 && vgcreate --maxlogicalvolumes 2 $vg2 $d3 $d4 &&
vgsplit --maxlogicalvolumes 2 $vg1 $vg2 $d1 2>err; vgsplit --maxlogicalvolumes 2 $vg1 $vg2 $d1 2>err;
status=$?; echo status=$?; test $status = 5 && status=$?; echo status=$status; test $status = 5 &&
grep "^ Volume group \"$vg2\" exists, but new VG option specified" err && grep "^ Volume group \"$vg2\" exists, but new VG option specified" err &&
vgremove $vg2 && vgremove $vg2 &&
vgremove $vg1' vgremove $vg1'
@ -109,7 +109,7 @@ test_expect_success \
'vgcreate --alloc cling $vg1 $d1 $d2 && 'vgcreate --alloc cling $vg1 $d1 $d2 &&
vgcreate --alloc cling $vg2 $d3 $d4 && vgcreate --alloc cling $vg2 $d3 $d4 &&
vgsplit --alloc cling $vg1 $vg2 $d1 2>err; vgsplit --alloc cling $vg1 $vg2 $d1 2>err;
status=$?; echo status=$?; test $status = 5 && status=$?; echo status=$status; test $status = 5 &&
grep "^ Volume group \"$vg2\" exists, but new VG option specified" err && grep "^ Volume group \"$vg2\" exists, but new VG option specified" err &&
vgremove $vg2 && vgremove $vg2 &&
vgremove $vg1' vgremove $vg1'
@ -119,7 +119,7 @@ test_expect_success \
'vgcreate --clustered n $vg1 $d1 $d2 && 'vgcreate --clustered n $vg1 $d1 $d2 &&
vgcreate --clustered n $vg2 $d3 $d4 && vgcreate --clustered n $vg2 $d3 $d4 &&
vgsplit --clustered n $vg1 $vg2 $d1 2>err; vgsplit --clustered n $vg1 $vg2 $d1 2>err;
status=$?; echo status=$?; test $status = 5 && status=$?; echo status=$status; test $status = 5 &&
grep "^ Volume group \"$vg2\" exists, but new VG option specified" err && grep "^ Volume group \"$vg2\" exists, but new VG option specified" err &&
vgremove $vg2 && vgremove $vg2 &&
vgremove $vg1' vgremove $vg1'
@ -131,7 +131,7 @@ test_expect_success \
vgcreate -M1 $vg1 $d3 $d4 && vgcreate -M1 $vg1 $d3 $d4 &&
vgcreate -M2 $vg2 $d1 $d2 && vgcreate -M2 $vg2 $d1 $d2 &&
vgsplit $vg1 $vg2 $d3 2>err; vgsplit $vg1 $vg2 $d3 2>err;
status=$?; echo status=$?; test $status = 5 && status=$?; echo status=$status; test $status = 5 &&
grep "^ Metadata types differ" err && grep "^ Metadata types differ" err &&
vgremove $vg2 && vgremove $vg2 &&
vgremove $vg1' vgremove $vg1'
@ -143,7 +143,7 @@ test_expect_success \
vgcreate $vg2 $d3 $d4 && vgcreate $vg2 $d3 $d4 &&
lvcreate -l 4 -n $lv1 $vg1 && lvcreate -l 4 -n $lv1 $vg1 &&
vgsplit $vg1 $vg2 $d1 2>err; vgsplit $vg1 $vg2 $d1 2>err;
status=$?; echo status=$?; test $status = 5 && status=$?; echo status=$status; test $status = 5 &&
grep "^ Logical volumes in \"$vg1\" must be inactive\$" err && grep "^ Logical volumes in \"$vg1\" must be inactive\$" err &&
vgremove -f $vg2 && vgremove -f $vg2 &&
vgremove -f $vg1' vgremove -f $vg1'
@ -158,7 +158,7 @@ test_expect_success \
vgchange -an $vg1 && vgchange -an $vg1 &&
vgchange -an $vg2 && vgchange -an $vg2 &&
vgsplit $vg1 $vg2 $d1 2>err; vgsplit $vg1 $vg2 $d1 2>err;
status=$?; echo status=$?; test $status = 5 && status=$?; echo status=$status; test $status = 5 &&
grep "^ Maximum number of logical volumes (2) exceeded" err && grep "^ Maximum number of logical volumes (2) exceeded" err &&
vgremove -f $vg2 && vgremove -f $vg2 &&
vgremove -f $vg1' vgremove -f $vg1'
@ -201,7 +201,7 @@ test_expect_success \
lvcreate -l 4 -n $lv2 $vg1 && lvcreate -l 4 -n $lv2 $vg1 &&
vgchange -an $vg1 && vgchange -an $vg1 &&
vgsplit $vg1 $vg2 $d3 2>err; vgsplit $vg1 $vg2 $d3 2>err;
status=$?; echo status=$?; test $status = 5 && status=$?; echo status=$status; test $status = 5 &&
vgremove -f $vg2 && vgremove -f $vg2 &&
vgremove -f $vg1' vgremove -f $vg1'