From c6d1b9797dd2850cd0b8be7f17a41db525cbe93d Mon Sep 17 00:00:00 2001 From: Jeff Darcy Date: Sun, 10 Apr 2016 10:51:11 -0400 Subject: tests: use trap mechanism to ensure that proper cleanups happen This actually consists of several parts. * Added a generic cleanup-scheduling mechanism. Instead of calling "trap ... EXIT" directly, just call "push_trapfunc ..." instead and your cleanup function will be called along with any others. * Converted a few tests to use push_trapfunc. * Added "push_trapfunc cleanup_lvm" to snapshot.rc to address the particular problem that's driving this - snapshot tests not calling cleanup_lvm on their own and leaving bad state for the next test. Change-Id: I548a97a26328390992fc71ee1f03c0463703f9d7 Signed-off-by: Jeff Darcy Reviewed-on: http://review.gluster.org/13933 Smoke: Gluster Build System NetBSD-regression: NetBSD Build System CentOS-regression: Gluster Build System Reviewed-by: Atin Mukherjee Reviewed-by: Rajesh Joseph --- tests/features/recon.t | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'tests/features') diff --git a/tests/features/recon.t b/tests/features/recon.t index 7dda2a680e8..9989f243380 100644 --- a/tests/features/recon.t +++ b/tests/features/recon.t @@ -1,5 +1,6 @@ #!/bin/bash +. $(dirname $0)/../traps.rc . $(dirname $0)/../include.rc . $(dirname $0)/../volume.rc @@ -11,7 +12,7 @@ FDL_META_FILE=${log_base}/${log_id}-meta-1.jnl FDL_DATA_FILE=${log_base}/${log_id}-data-1.jnl tmpdir=$(mktemp -d -t ${0##*/}.XXXXXX) -trap "rm -rf $tmpdir" EXIT +push_trapfunc "rm -rf $tmpdir" write_file () { echo "peekaboo" > $1 -- cgit