tests: use prepare_vg more often

diff --git a/test/shell/discards-thin.sh b/test/shell/discards-thin.sh
index f85b22c0eef275d5467d8d1f6903fdf030975a0b..9a66dc8f7ea85112373c1ae6c8792a4c816fedbd 100644 (file)
--- a/test/shell/discards-thin.sh
+++ b/test/shell/discards-thin.sh
@@ -25,12 +25,10 @@ export LVM_TEST_THIN_REPAIR_CMD=${LVM_TEST_THIN_REPAIR_CMD-/bin/false}
 #
 aux have_thin 1 1 0 || skip
 
-aux prepare_pvs 2 64
+aux prepare_vg 2 64
 
 aux extend_filter_LVMTEST
 
-vgcreate $vg -s 64K $(cat DEVICES)
-
 # Create named pool only
 lvcreate -l1 --discards ignore -T $vg/pool
 check lv_field $vg/pool discards "ignore"

diff --git a/test/shell/error-usage.sh b/test/shell/error-usage.sh
index 1f0307194f1f3d44b84a506f0c5b4dbc804e34a2..c8765a6c87872a66b66841c5d8a15d8266c0875d 100644 (file)
--- a/test/shell/error-usage.sh
+++ b/test/shell/error-usage.sh
@@ -16,9 +16,7 @@ SKIP_WITH_LVMPOLLD=1
 
 . lib/inittest
 
-aux prepare_pvs 1
-
-vgcreate -s 256k $vg $(cat DEVICES)
+aux prepare_vg 1
 
 lvcreate --type error -L1 -n $lv1 $vg
 lvextend -L+1 $vg/$lv1

diff --git a/test/shell/lvconvert-mirror-basic.sh b/test/shell/lvconvert-mirror-basic.sh
index 81fb0c6580c4e9c0e06f2c32b3bb8ea9773e60ea..c32b5c1a48d68cf02ac925611ae0bbec3a1e18d3 100644 (file)
--- a/test/shell/lvconvert-mirror-basic.sh
+++ b/test/shell/lvconvert-mirror-basic.sh
@@ -123,8 +123,7 @@ test_lvconvert() {
        fi
 }
 
-aux prepare_pvs 5 5
-vgcreate -s 32k $vg $(cat DEVICES)
+aux prepare_vg 5 5
 
 MIRRORED="mirrored"
 # FIXME: Cluster is not supporting exlusive activation of mirrored log

diff --git a/test/shell/lvconvert-raid456.sh b/test/shell/lvconvert-raid456.sh
index 358ceec5b5a0e06193c7cd40220f0625bafebfee..8c87a03f87bd40daf72c6b26614a44906b8310a1 100644 (file)
--- a/test/shell/lvconvert-raid456.sh
+++ b/test/shell/lvconvert-raid456.sh
@@ -28,8 +28,7 @@ get_image_pvs() {
 aux raid456_replace_works || skip
 aux have_raid 1 3 0 || skip
 
-aux prepare_pvs 7  # 7 devices for 2 dev replacement of 5-dev RAID6
-vgcreate -s 256k $vg $(cat DEVICES)
+aux prepare_vg 7  # 7 devices for 2 dev replacement of 5-dev RAID6
 
 levels="5 6"
 aux have_raid4 && levels="4 5 6"

diff --git a/test/shell/lvcreate-raid10.sh b/test/shell/lvcreate-raid10.sh
index bebe2212de327206e7d4410dc86eb44d2bb83327..68b4f46f230bc9a70eb45a67b9f9227cd3a1212f 100644 (file)
--- a/test/shell/lvcreate-raid10.sh
+++ b/test/shell/lvcreate-raid10.sh
@@ -23,9 +23,7 @@ lv_devices() {
 ########################################################
 aux have_raid 1 3 0 || skip
 
-aux prepare_pvs 6 20  # 6 devices for RAID10 (2-mirror,3-stripe) test
-vgcreate -s 512k $vg $(cat DEVICES)
-
+aux prepare_vg 6 20  # 6 devices for RAID10 (2-mirror,3-stripe) test
 #
 # Create RAID10:
 #

diff --git a/test/shell/lvextend-thin-full.sh b/test/shell/lvextend-thin-full.sh
index 8fc89a841d03af2dadb6ee8997e5d0e5fbe73aea..3bafad4b0369ba93eb7e7b2cb4a400ec7505790f 100644 (file)
--- a/test/shell/lvextend-thin-full.sh
+++ b/test/shell/lvextend-thin-full.sh
@@ -27,9 +27,7 @@ test -n "$LVM_TEST_THIN_RESTORE_CMD" || LVM_TEST_THIN_RESTORE_CMD=$(which thin_r
 
 aux have_thin 1 10 0 || skip
 
-aux prepare_pvs 3 256
-
-vgcreate -s 1M $vg $(cat DEVICES)
+aux prepare_vg 3 256
 
 aux lvmconf 'activation/thin_pool_autoextend_percent = 30' \
            'activation/thin_pool_autoextend_threshold = 70'

diff --git a/test/shell/lvmetad-dump.sh b/test/shell/lvmetad-dump.sh
index 67ea01b7f0a424ff0abae5bd9509531f2de58895..49cf9b769fad9e109306af3b27259b2553f51834 100644 (file)
--- a/test/shell/lvmetad-dump.sh
+++ b/test/shell/lvmetad-dump.sh
@@ -15,11 +15,13 @@ SKIP_WITH_LVMPOLLD=1
 
 . lib/inittest
 
+# check we can talk to lvmetad
+(echo | aux lvmetad_talk) || skip
+
 aux prepare_pvs 2
 vgcreate $vg1 "$dev1" "$dev2"
 lvcreate -n bar -l 1 $vg1
 
-(echo | aux lvmetad_talk) || skip
 aux lvmetad_dump | tee lvmetad.txt
 
 grep $vg1 lvmetad.txt

diff --git a/test/shell/lvresize-thin-external-origin.sh b/test/shell/lvresize-thin-external-origin.sh
index c1ebffe552ac891c6aa59a64bb1cb4992513174e..686da3959cb7cd1faca42b79247a3667a2e02972 100644 (file)
--- a/test/shell/lvresize-thin-external-origin.sh
+++ b/test/shell/lvresize-thin-external-origin.sh
@@ -23,9 +23,7 @@ aux have_thin 1 2 0 || skip
 # Pretend we miss the external_origin_extend feature
 aux lvmconf 'global/thin_disabled_features = [ "external_origin_extend" ]'
 
-aux prepare_pvs 2
-
-vgcreate -s 1M $vg $(cat DEVICES)
+aux prepare_vg 2
 
 lvcreate -L10 -n $lv1 $vg
 

diff --git a/test/shell/lvresize-thin-metadata.sh b/test/shell/lvresize-thin-metadata.sh
index 2ef4fcef32ffe05619716c68e1c5b87f881e49f5..a08fb407054fe40e590167c0671a33b17c79788f 100644 (file)
--- a/test/shell/lvresize-thin-metadata.sh
+++ b/test/shell/lvresize-thin-metadata.sh
@@ -18,9 +18,7 @@ export LVM_TEST_THIN_REPAIR_CMD=${LVM_TEST_THIN_REPAIR_CMD-/bin/false}
 
 aux have_thin 1 10 0 || skip
 
-aux prepare_pvs 3 1256
-
-vgcreate -s 1M $vg $(cat DEVICES)
+aux prepare_vg 3 1256
 
 for deactivate in true false; do
 # Create some thin volumes

diff --git a/test/shell/pvmove-all-segtypes.sh b/test/shell/pvmove-all-segtypes.sh
index e5f3b74b186563b8ca686012359fd978c8f3853c..6a34ecf3df353d41ab3614e6a16b3463b8f06be9 100644 (file)
--- a/test/shell/pvmove-all-segtypes.sh
+++ b/test/shell/pvmove-all-segtypes.sh
@@ -17,8 +17,7 @@ SKIP_WITH_LVMLOCKD=1
 
 which md5sum || skip
 
-aux prepare_pvs 5 20
-vgcreate -s 256k $vg $(cat DEVICES)
+aux prepare_vg 5 20
 
 # Each of the following tests does:
 # 1) Create two LVs - one linear and one other segment type

diff --git a/test/shell/thin-foreign-dmeventd.sh b/test/shell/thin-foreign-dmeventd.sh
index 50ff44e4a73c12a355336f3749913d9456e4eab5..4ba32059bab5919690c705f8d3e3198e4d0fb1ec 100644 (file)
--- a/test/shell/thin-foreign-dmeventd.sh
+++ b/test/shell/thin-foreign-dmeventd.sh
@@ -42,9 +42,7 @@ which mkfs.ext4 || skip
 export MKE2FS_CONFIG="$TESTOLDPWD/lib/mke2fs.conf"
 
 aux prepare_dmeventd
-aux prepare_pvs 2 64
-
-vgcreate $vg -s 64K $(cat DEVICES)
+aux prepare_vg 2 64
 
 # Create named pool only
 lvcreate --errorwhenfull y -L2 -T $vg/pool

diff --git a/test/shell/thin-resize-match.sh b/test/shell/thin-resize-match.sh
index 047225b2802d9e5e68f19457490ce51be658e6d1..c78842f0e49f35559648dfbe90e9cbcc71ced49d 100644 (file)
--- a/test/shell/thin-resize-match.sh
+++ b/test/shell/thin-resize-match.sh
@@ -23,9 +23,7 @@ which md5sum || skip
 
 aux have_thin 1 0 0 || skip
 
-aux prepare_pvs 2 20
-
-vgcreate -s 512K $vg $(< DEVICES)
+aux prepare_vg 2 20
 
 lvcreate -L1M -V2M -n $lv1 -T $vg/pool
 

diff --git a/test/shell/zero-usage.sh b/test/shell/zero-usage.sh
index 768df28158b52f8b79988be1ff632d5d7ba96a19..5d393f5ba5af2d6627d8d469ce468e5457049621 100644 (file)
--- a/test/shell/zero-usage.sh
+++ b/test/shell/zero-usage.sh
@@ -18,9 +18,7 @@ SKIP_WITH_LVMPOLLD=1
 
 which md5sum || skip
 
-aux prepare_pvs 1
-
-vgcreate -s 256k $vg $(cat DEVICES)
+aux prepare_vg 1
 
 lvcreate --type zero -L1 -n $lv1 $vg
 lvextend -L+1 $vg/$lv1