From 683ef85a1ec274d4832068dd7c2c0762e617dd69 Mon Sep 17 00:00:00 2001
From: Zdenek Kabelac <zkabelac@redhat.com>
Date: Mon, 28 Feb 2011 19:44:21 +0000
Subject: [PATCH] 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.
---
 test/t-lvconvert-repair-policy.sh   | 2 ++
 test/t-lvconvert-repair-replace.sh  | 2 ++
 test/t-lvconvert-repair-snapshot.sh | 3 +++
 test/t-lvconvert-repair.sh          | 2 ++
 test/t-lvcreate-mirror.sh           | 2 ++
 test/t-lvcreate-pvtags.sh           | 3 +++
 6 files changed, 14 insertions(+)

diff --git a/test/t-lvconvert-repair-policy.sh b/test/t-lvconvert-repair-policy.sh
index d27d870e7..8240f9e3f 100644
--- 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 1a0bdebdc..27a7f04b4 100644
--- 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 97bc2d7f7..baca87dd2 100644
--- 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 635e4c8ba..6a6b88e95 100644
--- 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 c9488acc6..ae3984cfb 100644
--- 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 99b7ac60c..802bb74cc 100755
--- 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