Use backward compatible configuration for test

Currently the test are not properly working with new code.
Use settings for the previous behaviour.

FIXME: update tests to properly test new allocation policies.

diff --git a/test/t-lvconvert-repair-policy.sh b/test/t-lvconvert-repair-policy.sh
index d27d870e765f3edf0cab8217074079bc22b5e551..8240f9e3fc331192ad0aaee10d7d89db89e509c1 100644 (file)
--- a/test/t-lvconvert-repair-policy.sh
+++ b/test/t-lvconvert-repair-policy.sh
@@ -12,6 +12,8 @@
 . lib/test
 
 aux prepare_vg 4
+aux lvmconf 'allocation/maximise_cling = 0'
+aux lvmconf 'allocation/mirror_logs_require_separate_pvs = 1'
 
 # Clean-up and create a 2-way mirror, where the the
 # leg devices are always on $dev[12] and the log

diff --git a/test/t-lvconvert-repair-replace.sh b/test/t-lvconvert-repair-replace.sh
index 1a0bdebdcb6634f40fb80a7596daae8d476f8f3c..27a7f04b4cc03a5f755742517f1ef8ed18ae8cc7 100644 (file)
--- a/test/t-lvconvert-repair-replace.sh
+++ b/test/t-lvconvert-repair-replace.sh
@@ -12,6 +12,8 @@
 . lib/test
 
 aux prepare_vg 6
+aux lvmconf 'allocation/maximise_cling = 0'
+aux lvmconf 'allocation/mirror_logs_require_separate_pvs = 1'
 
 # 3-way, disk log
 # multiple failures, full replace

diff --git a/test/t-lvconvert-repair-snapshot.sh b/test/t-lvconvert-repair-snapshot.sh
index 97bc2d7f7597e1975173f387562e08a092aa59f2..baca87dd2ba45d4f7f696d1fb83b7f74996a8b64 100644 (file)
--- a/test/t-lvconvert-repair-snapshot.sh
+++ b/test/t-lvconvert-repair-snapshot.sh
@@ -11,6 +11,9 @@
 . lib/test
 
 aux prepare_vg 5
+aux lvmconf 'allocation/maximise_cling = 0'
+aux lvmconf 'allocation/mirror_logs_require_separate_pvs = 1'
+
 lvcreate -m 3 --ig -L 2M -n 4way $vg $dev1 $dev2 $dev3 $dev4 $dev5:0
 lvcreate -s $vg/4way -L 2M -n snap
 

diff --git a/test/t-lvconvert-repair.sh b/test/t-lvconvert-repair.sh
index 635e4c8ba8ac0c285d965d701962216f3a69595a..6a6b88e95900a5c23b177d7fc301b6418a9c570a 100644 (file)
--- a/test/t-lvconvert-repair.sh
+++ b/test/t-lvconvert-repair.sh
@@ -11,6 +11,8 @@
 
 . lib/test
 
+aux lvmconf 'allocation/maximise_cling = 0'
+aux lvmconf 'allocation/mirror_logs_require_separate_pvs = 1'
 
 # fail multiple devices
 

diff --git a/test/t-lvcreate-mirror.sh b/test/t-lvcreate-mirror.sh
index c9488acc64ec5d8938d2d399fe8f969c2e44e1fd..ae3984cfbe2806886fb4bd841f65986c974cc0be 100644 (file)
--- a/test/t-lvcreate-mirror.sh
+++ b/test/t-lvcreate-mirror.sh
@@ -11,6 +11,8 @@
 
 . lib/test
 aux prepare_vg 5 80
+aux lvmconf 'allocation/maximise_cling = 0'
+aux lvmconf 'allocation/mirror_logs_require_separate_pvs = 1'
 
 # 2-way mirror with corelog, 2 PVs
 lvcreate -l2 -m1 --mirrorlog core -n $lv1 $vg $dev1 $dev2

diff --git a/test/t-lvcreate-pvtags.sh b/test/t-lvcreate-pvtags.sh
index 99b7ac60c64ce517f5c3db2bca77c57685ddc5a7..802bb74cc57e9fb96aba81ea4af3e72f3aa3488d 100755 (executable)
--- a/test/t-lvcreate-pvtags.sh
+++ b/test/t-lvcreate-pvtags.sh
@@ -11,6 +11,9 @@
 . lib/test
 
 aux prepare_pvs 3
+aux lvmconf 'allocation/maximise_cling = 0'
+aux lvmconf 'allocation/mirror_logs_require_separate_pvs = 1'
+
 # not required, just testing
 aux pvcreate --metadatacopies 0 $dev1