test: move common code for thin init

diff --git a/test/lib/aux.sh b/test/lib/aux.sh
index d972d10f6d3a9b9c24d637439fbff93579a11660..f179e313ed1bc2813c06c66b9c380aa0ccd21115 100644 (file)
--- a/test/lib/aux.sh
+++ b/test/lib/aux.sh
@@ -534,6 +534,9 @@ have_thin()
 {
     target_at_least dm-thin-pool "$@" || exit 1
     test "$THIN" = shared || test "$THIN" = internal || exit 1
+
+# disable thin_check if not present in system
+    which thin_check || lvmconf 'global/thin_check_executable = ""'
 }
 
 test -f DEVICES && devs=$(cat DEVICES)

diff --git a/test/shell/discards-thin.sh b/test/shell/discards-thin.sh
index ec3bd1f8b44daccab50e27bd8785f6ba7cfdf0e8..4aa429344b436597b1a518c3cd51a5880d7b2cae 100644 (file)
--- a/test/shell/discards-thin.sh
+++ b/test/shell/discards-thin.sh
@@ -22,9 +22,6 @@ aux have_thin 1 1 0 || skip
 
 aux prepare_pvs 2 64
 
-# disable thin_check if not present in system
-which thin_check || aux lvmconf 'global/thin_check_executable = ""'
-
 clustered=
 test -e LOCAL_CLVMD && clustered="--clustered y"
 

diff --git a/test/shell/lvconvert-thin.sh b/test/shell/lvconvert-thin.sh
index abaa620cb6f15c346b512f67972621342efa57c8..32661cdd7ffc75ec8f5622ac43dbcd0769348f8e 100644 (file)
--- a/test/shell/lvconvert-thin.sh
+++ b/test/shell/lvconvert-thin.sh
@@ -19,9 +19,6 @@ aux have_thin 1 0 0 || skip
 
 aux prepare_pvs 4 64
 
-# disable thin_check if not present in system
-which thin_check || aux lvmconf 'global/thin_check_executable = ""'
-
 clustered=
 test -e LOCAL_CLVMD && clustered="--clustered y"
 

diff --git a/test/shell/lvcreate-thin-snap.sh b/test/shell/lvcreate-thin-snap.sh
index 2ee8748eb89f8662e9312583b03ed61d4367b182..18846e35f7a528fbd9cbb20a124d074e19089436 100644 (file)
--- a/test/shell/lvcreate-thin-snap.sh
+++ b/test/shell/lvcreate-thin-snap.sh
@@ -30,9 +30,6 @@ aux have_thin 1 0 0 || skip
 
 aux prepare_pvs 2 64
 
-# disable thin_check if not present in system
-which thin_check || aux lvmconf 'global/thin_check_executable = ""'
-
 clustered=
 test -e LOCAL_CLVMD && clustered="--clustered y"
 

diff --git a/test/shell/lvcreate-thin.sh b/test/shell/lvcreate-thin.sh
index 7ba97ed0ef56a9587af5a6e8fb0e0d9ccd5288a8..8ad552b7249b092721c178c0e0618dba7c4e7b5a 100644 (file)
--- a/test/shell/lvcreate-thin.sh
+++ b/test/shell/lvcreate-thin.sh
@@ -33,9 +33,6 @@ aux have_thin 1 0 0 || skip
 
 aux prepare_pvs 2 64
 
-# disable thin_check if not present in system
-which thin_check || aux lvmconf 'global/thin_check_executable = ""'
-
 clustered=
 test -e LOCAL_CLVMD && clustered="--clustered y"