diff options
| author | Jeff Darcy <jdarcy@redhat.com> | 2016-04-10 10:51:11 -0400 |
|---|---|---|
| committer | Jeff Darcy <jdarcy@redhat.com> | 2016-04-12 05:04:24 -0700 |
| commit | c6d1b9797dd2850cd0b8be7f17a41db525cbe93d (patch) | |
| tree | 21a5972bc7f5f6d19e51b27d487a29ae7ef28f42 /tests/bugs | |
| parent | 5cbe6baa0258074d5003e6cdfc9997adb006750f (diff) | |
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 <jdarcy@redhat.com>
Reviewed-on: http://review.gluster.org/13933
Smoke: Gluster Build System <jenkins@build.gluster.com>
NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
CentOS-regression: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Atin Mukherjee <amukherj@redhat.com>
Reviewed-by: Rajesh Joseph <rjoseph@redhat.com>
Diffstat (limited to 'tests/bugs')
| -rw-r--r-- | tests/bugs/disperse/bug-1161621.t | 5 |
1 files changed, 2 insertions, 3 deletions
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 |