diff options
| author | Kaleb S. KEITHLEY <kkeithle@redhat.com> | 2013-09-05 08:56:25 -0400 |
|---|---|---|
| committer | Anand Avati <avati@redhat.com> | 2013-09-09 17:23:40 -0700 |
| commit | 71f8726b0a94ee830454369f7da2b508d8975d30 (patch) | |
| tree | dac040b16ec58cf7909da98b8499444db26b1586 | |
| parent | 8d31709041e098a7d508f43f4de9c854b88a8c2e (diff) | |
tests: call 'cleanup' at the end of each test (backport BZ 983975)
Some tests do not cleanup after themselves. That is bad behaviour and
makes it difficult to run single tests and verify the state of the
system afterwards.
Change-Id: I5cf80a4a996c691e6b82fd9ce9c711951dc26138
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
BUG: 1004756
Reviewed-on: http://review.gluster.org/5821
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Niels de Vos <ndevos@redhat.com>
| -rw-r--r-- | tests/bugs/bug-856455.t | 2 | ||||
| -rw-r--r-- | tests/bugs/bug-860663.t | 2 | ||||
| -rw-r--r-- | tests/bugs/bug-862967.t | 2 | ||||
| -rw-r--r-- | tests/bugs/bug-878004.t | 2 | ||||
| -rwxr-xr-x | tests/bugs/bug-884455.t | 2 | ||||
| -rwxr-xr-x | tests/bugs/bug-893378.t | 2 | ||||
| -rwxr-xr-x | tests/bugs/bug-902610.t | 1 |
7 files changed, 12 insertions, 1 deletions
diff --git a/tests/bugs/bug-856455.t b/tests/bugs/bug-856455.t index 1b2438b04..59409ca37 100644 --- a/tests/bugs/bug-856455.t +++ b/tests/bugs/bug-856455.t @@ -38,3 +38,5 @@ EXPECT $BRICK_COUNT query_pathinfo $M0/f00d; kill -9 `cat /var/lib/glusterd/vols/$V0/run/$H0-d-backends-${V0}1.pid`; EXPECT `expr $BRICK_COUNT - 1` query_pathinfo $M0/f00d; + +cleanup diff --git a/tests/bugs/bug-860663.t b/tests/bugs/bug-860663.t index 28d1f8fcd..5720492d5 100644 --- a/tests/bugs/bug-860663.t +++ b/tests/bugs/bug-860663.t @@ -47,3 +47,5 @@ sleep 5; NEW_FILE_COUNT=`ls -l $M0 | wc -l`; EXPECT "0" file_count $ORIG_FILE_COUNT $NEW_FILE_COUNT + +cleanup diff --git a/tests/bugs/bug-862967.t b/tests/bugs/bug-862967.t index 73f5826fa..4f691b903 100644 --- a/tests/bugs/bug-862967.t +++ b/tests/bugs/bug-862967.t @@ -55,3 +55,5 @@ BACKEND_GID=`stat --printf=%g $B0/${V0}1/dir`; EXPECT "0" uid_gid_compare $NEW_UID $NEW_GID $BACKEND_UID $BACKEND_GID + +cleanup diff --git a/tests/bugs/bug-878004.t b/tests/bugs/bug-878004.t index 5397be2a6..8dc983553 100644 --- a/tests/bugs/bug-878004.t +++ b/tests/bugs/bug-878004.t @@ -25,4 +25,4 @@ EXPECT '2' brick_count $V0 TEST $CLI volume remove-brick $V0 $H0:$B0/${V0}3; EXPECT '1' brick_count $V0 - +cleanup diff --git a/tests/bugs/bug-884455.t b/tests/bugs/bug-884455.t index 46e55dad6..19c888eee 100755 --- a/tests/bugs/bug-884455.t +++ b/tests/bugs/bug-884455.t @@ -80,3 +80,5 @@ EXPECT "0" get_layout $B0/${V0}0/dir7 $B0/${V0}1/dir7 $B0/${V0}2/dir7 EXPECT "0" get_layout $B0/${V0}0/dir8 $B0/${V0}1/dir8 $B0/${V0}2/dir8 EXPECT "0" get_layout $B0/${V0}0/dir9 $B0/${V0}1/dir9 $B0/${V0}2/dir9 EXPECT "0" get_layout $B0/${V0}0/dir10 $B0/${V0}1/dir10 $B0/${V0}2/dir10 + +cleanup diff --git a/tests/bugs/bug-893378.t b/tests/bugs/bug-893378.t index 470589f53..f5fd49c39 100755 --- a/tests/bugs/bug-893378.t +++ b/tests/bugs/bug-893378.t @@ -69,3 +69,5 @@ ls -l $M0/2 2>/dev/null dd if=/dev/zero of=$M0/2 bs=1 count=1 conv=excl 2>/dev/null EXPECT "1" echo $? + +cleanup diff --git a/tests/bugs/bug-902610.t b/tests/bugs/bug-902610.t index f5eb6be02..3cc449ba6 100755 --- a/tests/bugs/bug-902610.t +++ b/tests/bugs/bug-902610.t @@ -56,3 +56,4 @@ mkdir $M0/dir1 2>/dev/null get_layout $B0/${V0}0/dir1 $B0/${V0}1/dir1 EXPECT "0" echo $? +cleanup |