ctdb-tests: Drop cleanup_handler()

Running testsuite-specific code here isn't a good option.

Daemons are now shut down in ctdb_test_exit(), even when testing is
interrupted.

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>

diff --git a/ctdb/tests/run_tests.sh b/ctdb/tests/run_tests.sh
index 8eead527b33bae016078104b5b0d3d3205ae7283..dc9027df99687829820d47fb9889049510aa1598 100755 (executable)
--- a/ctdb/tests/run_tests.sh
+++ b/ctdb/tests/run_tests.sh
@@ -284,18 +284,7 @@ do_cleanup ()
     fi
 }
 
-cleanup_handler ()
-{
-    if $TEST_CLEANUP ; then
-       if [ -n "$TEST_LOCAL_DAEMONS" -a "$f" = "simple" ] ; then
-           echo "***** shutting down daemons *****"
-           find_and_run_one_test simple/99_daemons_shutdown.sh "$tests_dir"
-       fi
-    fi
-    do_cleanup
-}
-
-trap cleanup_handler SIGINT SIGTERM
+trap do_cleanup SIGINT SIGTERM
 
 declare -a tests
 i=0