LU-2840 tests: Clean the environment for test.

[fs/lustre-release.git] / lustre / tests / sanityn.sh

diff --git a/lustre/tests/sanityn.sh b/lustre/tests/sanityn.sh
index 7b91df3..63b2aa7 100644 (file)
--- a/lustre/tests/sanityn.sh
+++ b/lustre/tests/sanityn.sh
@@ -472,18 +472,18 @@ run_test 20 "test extra readahead page left in cache ===="
 
 cleanup_21() {
        trap 0
-       umount $DIR1/d21
+       umount $DIR1/$tdir
 }
 
 test_21() { # Bug 5907
-       test_mkdir $DIR1/d21
-       mount /etc $DIR1/d21 --bind || error "mount failed" # Poor man's mount.
+       test_mkdir $DIR1/$tdir
+       mount /etc $DIR1/$tdir --bind || error "mount failed" # Poor man's mount.
        trap cleanup_21 EXIT
-       rmdir -v $DIR1/d21 && error "Removed mounted directory"
-       rmdir -v $DIR2/d21 && echo "Removed mounted directory from another mountpoint, needs to be fixed"
-       test -d $DIR1/d21 || error "Mounted directory disappeared"
+       rmdir -v $DIR1/$tdir && error "Removed mounted directory"
+       rmdir -v $DIR2/$tdir && echo "Removed mounted directory from another mountpoint, needs to be fixed"
+       test -d $DIR1/$tdir || error "Mounted directory disappeared"
        cleanup_21
-       test -d $DIR2/d21 || test -d $DIR1/d21 && error "Removed dir still visible after umount"
+       test -d $DIR2/$tdir || test -d $DIR1/$tdir && error "Removed dir still visible after umount"
        true
 }
 run_test 21 " Try to remove mountpoint on another dir ===="
@@ -2286,7 +2286,7 @@ test_51a() {
        # open and sleep 2 seconds then read
        $MULTIOP $DIR2/$tfile o_2r${filesize}c &
        local pid=$!
-       sleep 0.1
+       sleep 1
 
        # create the layout of testing file
        dd if=$origfile of=$DIR1/$tfile conv=notrunc > /dev/null
@@ -2311,7 +2311,7 @@ test_51b() {
        $LCTL set_param fail_loc=0x1404
        stat -c %s $DIR2/$tfile |tee $tmpfile &
        local pid=$!
-       sleep 0.1
+       sleep 1
 
        # create layout of testing file
        dd if=/dev/zero of=$DIR1/$tfile bs=1k count=1 conv=notrunc > /dev/null
@@ -2336,7 +2336,7 @@ test_51c() {
        echo "Setting layout ..."
        $LFS setstripe -c $OSTCOUNT $DIR1/$tfile &
        pid=$!
-       sleep 0.1
+       sleep 1
 
        # get layout of this file should wait until dd is finished
        local stripecnt=`$LFS getstripe -c $DIR2/$tfile`