From: Sebastien Ponce <sebastien.ponce@cern.ch>
Date: Wed, 27 May 2015 15:15:16 +0000 (+0200)
Subject: tests : Fixed radosstriper tests to introduce the needed calls to setup and teardown
X-Git-Tag: v9.0.3~100^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=9624cf273f13d8e6983ccfb8789cf2874ac79260;p=ceph.git

tests : Fixed radosstriper tests to introduce the needed calls to setup and teardown

In particular port 7112 was replaced by 7113 for the monitor as 7112 is taken by test-erasure-eio now
And calls to setup and teardown have been added around the testing shell code
---

diff --git a/src/test/libradosstriper/rados-striper.sh b/src/test/libradosstriper/rados-striper.sh
index b6820271bac9..a631022a9140 100755
--- a/src/test/libradosstriper/rados-striper.sh
+++ b/src/test/libradosstriper/rados-striper.sh
@@ -20,11 +20,14 @@ function run() {
     local dir=$1
     shift
 
-    export CEPH_MON="127.0.0.1:7112"
+    export CEPH_MON="127.0.0.1:7113"
     export CEPH_ARGS
     CEPH_ARGS+="--fsid=$(uuidgen) --auth-supported=none "
     CEPH_ARGS+="--mon-host=$CEPH_MON "
-   
+
+    # setup
+    setup $dir || return 1
+
     # create a cluster with one monitor and three osds
     run_mon $dir a || return 1
     run_osd $dir 0 || return 1
@@ -83,7 +86,10 @@ function run() {
     rados --pool rbd --striper stat toyfile >& $dir/staterror2
     grep -q 'No such file or directory' $dir/staterror2 || return 1
     rados --pool rbd stat toyfile.0000000000000000 >& $dir/staterror3
-    grep -q 'No such file or directory' $dir/staterror3 || return 1   
+    grep -q 'No such file or directory' $dir/staterror3 || return 1
+
+    # cleanup
+    teardown $dir || return 1
 }
 
 main rados-striper "$@"