From: Elena Gryaznova <grev@sun.com>
Date: Wed, 3 Feb 2010 21:58:09 +0000 (+0300)
Subject: b=18489 test_116, test_118k cleanup
X-Git-Tag: v1_8_2_50~29
X-Git-Url: https://git.whamcloud.com/gitweb?a=commitdiff_plain;h=39fde0887e459979d272d8f2da3fae1b3d3c15d7;p=fs%2Flustre-release.git

b=18489 test_116, test_118k cleanup

i=Andrew.Perepechko (panda)
i=Andreas.Dilger
---

diff --git a/lustre/tests/sanity.sh b/lustre/tests/sanity.sh
index 4575664..d636f1d 100644
--- a/lustre/tests/sanity.sh
+++ b/lustre/tests/sanity.sh
@@ -4544,7 +4544,7 @@ test_116() {
 	[ $MINC -gt 0 ] && echo "Wrote $(($MAXC * 100 / $MINC - 100))% more files to larger OST $MAXI1"
 	[ $MAXC -gt $MINC ] || error_ignore "stripe QOS didn't balance free space"
 
-	rm -rf $DIR/$tdir/OST${MINI}
+	rm -rf $DIR/$tdir
 }
 run_test 116 "stripe QOS: free space balance ==================="
 
@@ -4892,16 +4892,17 @@ test_118k()
 	set_nodes_failloc "$(osts_nodes)" 0x20e
 	mkdir -p $DIR/$tdir
 
-        for ((i=0;i<10;i++)); do
-                (dd if=/dev/zero of=$DIR/$tdir/$tfile-$i bs=1M count=10 || \
+	for ((i=0;i<10;i++)); do
+		(dd if=/dev/zero of=$DIR/$tdir/$tfile-$i bs=1M count=10 || \
 			error "dd to $DIR/$tdir/$tfile-$i failed" )&
-	        SLEEPPID=$!
-                sleep 0.500s
-	        kill $SLEEPPID
-	        wait $SLEEPPID
-        done
+		SLEEPPID=$!
+		sleep 0.500s
+		kill $SLEEPPID
+		wait $SLEEPPID
+	done
 
-        set_nodes_failloc "$(osts_nodes)" 0
+	set_nodes_failloc "$(osts_nodes)" 0
+	rm -rf $DIR/$tdir
 }
 run_test 118k "bio alloc -ENOMEM and IO TERM handling ========="