tests: kill mon-test-helpers.sh call_TEST_functions

Remove call_TEST_functions because it is too complex and rarely used.
Replace the two instances where it was used by a few lines doing the
same thing.

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

diff --git a/src/test/mon/mon-test-helpers.sh b/src/test/mon/mon-test-helpers.sh
index 02ab03a222242de05adc3b90fce7ccd30c6976b9..ef52c31ccdafad1b7b080fce4162bd03a17a9d48 100644 (file)
--- a/src/test/mon/mon-test-helpers.sh
+++ b/src/test/mon/mon-test-helpers.sh
@@ -77,31 +77,6 @@ function kill_daemons() {
     done
 }
 
-function call_TEST_functions() {
-    local dir=$1
-    shift
-    local id=$1
-    shift
-
-    setup $dir || return 1
-    run_mon $dir $id "$@"
-    SHARE_MON_FUNCTIONS=${SHARE_MON_FUNCTIONS:-$(set | sed -n -e 's/^\(SHARE_MON_TEST_[0-9a-z_]*\) .*/\1/p')}
-    for TEST_function in $SHARE_MON_FUNCTIONS ; do
-        if ! $TEST_function $dir $id ; then
-            cat $dir/$id/log
-            return 1
-        fi
-    done
-    teardown $dir || return 1
-
-    FUNCTIONS=${FUNCTIONS:-$(set | sed -n -e 's/^\(TEST_[0-9a-z_]*\) .*/\1/p')}
-    for TEST_function in $FUNCTIONS ; do
-        setup $dir || return 1
-        $TEST_function $dir || return 1
-        teardown $dir || return 1
-    done
-}
-
 function main() {
     local dir=testdir/$1
 

diff --git a/src/test/osd/osd-config.sh b/src/test/osd/osd-config.sh
index aceda0cf121bffd08eb320eea87762d5f34a94b1..3606f6381741d2ddc4f74abf060fd3728430eb9c 100755 (executable)
--- a/src/test/osd/osd-config.sh
+++ b/src/test/osd/osd-config.sh
@@ -27,8 +27,12 @@ function run() {
     CEPH_ARGS+="--mon-host=$CEPH_MON "
     CEPH_ARGS+="--fsid=$(uuidgen) --auth-supported=none "
 
-    local id=a
-    call_TEST_functions $dir $id || return 1
+    FUNCTIONS=${FUNCTIONS:-$(set | sed -n -e 's/^\(TEST_[0-9a-z_]*\) .*/\1/p')}
+    for TEST_function in $FUNCTIONS ; do
+        setup $dir || return 1
+        $TEST_function $dir || return 1
+        teardown $dir || return 1
+    done
 }
 
 function TEST_config_init() {

diff --git a/src/test/osd/osd-copy-from.sh b/src/test/osd/osd-copy-from.sh
index b4120c5ad450b934792830efe7206fa73e2934f6..64e15c46f54090a92008dc24ddfab953a5531c8d 100755 (executable)
--- a/src/test/osd/osd-copy-from.sh
+++ b/src/test/osd/osd-copy-from.sh
@@ -28,8 +28,12 @@ function run() {
     CEPH_ARGS+="--fsid=$(uuidgen) --auth-supported=none "
     CEPH_ARGS+="--mon-host=$CEPH_MON "
 
-    local id=a
-    call_TEST_functions $dir $id || return 1
+    FUNCTIONS=${FUNCTIONS:-$(set | sed -n -e 's/^\(TEST_[0-9a-z_]*\) .*/\1/p')}
+    for TEST_function in $FUNCTIONS ; do
+        setup $dir || return 1
+        $TEST_function $dir || return 1
+        teardown $dir || return 1
+    done
 }
 
 function TEST_copy_from() {