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/bugs/disperse/bug-1161621.t | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'tests/bugs') diff --git a/tests/bugs/disperse/bug-1161621.t b/tests/bugs/disperse/bug-1161621.t index 56d4cede090..84361e440dc 100644 --- a/tests/bugs/disperse/bug-1161621.t +++ b/tests/bugs/disperse/bug-1161621.t @@ -1,5 +1,6 @@ #!/bin/bash +. $(dirname $0)/../../traps.rc . $(dirname $0)/../../include.rc . $(dirname $0)/../../volume.rc @@ -16,7 +17,7 @@ TEST $GFS --volfile-id=/$V0 --volfile-server=$H0 $M1 EXPECT_WITHIN $CHILD_UP_TIMEOUT "5" ec_child_up_count $V0 0 tmpdir=$(mktemp -d -t ${0##*/}.XXXXXX) -trap "rm -rf $tmpdir" EXIT +push_trapfunc "rm -rf $tmpdir" TEST dd if=/dev/urandom of=$tmpdir/file bs=1234 count=20 cs=$(sha1sum $tmpdir/file | awk '{ print $1 }') @@ -38,6 +39,4 @@ wait EXPECT "24680000" stat -c "%s" $M0/shared EXPECT "$cs" echo $(sha1sum $M0/shared | awk '{ print $1 }') -TEST rm -rf $tmpdir - cleanup -- cgit