From: Loic Dachary <ldachary@redhat.com>
Date: Sun, 17 May 2015 10:26:06 +0000 (+0200)
Subject: tests: ceph-helpers.sh remove redundant setup in main
X-Git-Tag: v9.0.2~146^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ae2d489bac3b307e005d05c60d9d6d5280dd04e2;p=ceph.git

tests: ceph-helpers.sh remove redundant setup in main

And add setup/teardown in tests that do not have it.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
---

diff --git a/src/test/ceph-helpers.sh b/src/test/ceph-helpers.sh
index af14f4eb04ff..58eea9bbebd1 100755
--- a/src/test/ceph-helpers.sh
+++ b/src/test/ceph-helpers.sh
@@ -1091,7 +1091,6 @@ function main() {
     export CEPH_CONF=/dev/null
     unset CEPH_ARGS
 
-    setup $dir || return 1
     local code
     if run $dir "$@" ; then
         code=0
diff --git a/src/test/mon/mon-handle-forward.sh b/src/test/mon/mon-handle-forward.sh
index 54104207ccaf..15fbdc561efe 100755
--- a/src/test/mon/mon-handle-forward.sh
+++ b/src/test/mon/mon-handle-forward.sh
@@ -20,6 +20,8 @@ source test/ceph-helpers.sh
 function run() {
     local dir=$1
 
+    setup $dir || return 1
+
     MONA=127.0.0.1:7300
     MONB=127.0.0.1:7301
     (
@@ -51,6 +53,8 @@ function run() {
     features=$(sed -n -e 's|.*127.0.0.1:0.*accept features \([0-9][0-9]*\)|\1|p' < \
         $dir/mon.b.log)
     grep ' forward(mon_command(.*"POOL2".*con_features '$features $dir/mon.a.log
+
+    teardown $dir || return 1
 }
 
 main mon-handle-forward "$@"
diff --git a/src/test/osd/osd-bench.sh b/src/test/osd/osd-bench.sh
index d99a92ad84f3..e40000f2046f 100755
--- a/src/test/osd/osd-bench.sh
+++ b/src/test/osd/osd-bench.sh
@@ -29,7 +29,9 @@ function run() {
 
     local funcs=${@:-$(set | sed -n -e 's/^\(TEST_[0-9a-z_]*\) .*/\1/p')}
     for func in $funcs ; do
+        setup $dir || return 1
         $func $dir || return 1
+        teardown $dir || return 1
     done
 }