diff options
| author | Martin Schwenke <martin@meltin.net> | 2018-10-08 13:38:10 +1100 |
|---|---|---|
| committer | Amitay Isaacs <amitay@samba.org> | 2018-11-06 07:16:16 +0100 |
| commit | 92337234e5ebe06397e34861b10cda5dfc5b7ed5 (patch) | |
| tree | bcf2bda3b28757a3655e30bc66e11ccd971bf2b6 /ctdb/tests | |
| parent | 0e9ead8f28fced3ebfa888786a1dc5bb59e734a3 (diff) | |
| download | samba-92337234e5ebe06397e34861b10cda5dfc5b7ed5.tar.gz | |
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>
Diffstat (limited to 'ctdb/tests')
| -rwxr-xr-x | ctdb/tests/run_tests.sh | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/ctdb/tests/run_tests.sh b/ctdb/tests/run_tests.sh index 8eead527b33..dc9027df996 100755 --- 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 |