From c2693d544e4ae424c0fe23fcb2603170ac3d02d1 Mon Sep 17 00:00:00 2001 From: Emoly Liu Date: Wed, 10 Apr 2013 10:34:55 +0800 Subject: [PATCH] LU-3226 test: do some cleanup for sanity.sh test_43a/b This patch includes the following minor fixes for sanity.sh test_43a/b: - to remove multiop after the current test and provide a clean env for the next test; - to do some style cleanup. Test-Parameters: clientdistro=fc18 clientarch=x86_64 serverdistro=el6 serverarch=x86_64 testlist=sanity Signed-off-by: Liu Ying Change-Id: I86221d9dbf1188b553b3c65bb14298e62f19f820 Reviewed-on: http://review.whamcloud.com/6414 Tested-by: Hudson Tested-by: Maloo Reviewed-by: Bobi Jam Reviewed-by: Jian Yu Reviewed-by: Oleg Drokin --- lustre/tests/sanity.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lustre/tests/sanity.sh b/lustre/tests/sanity.sh index a489aba..47c4f21 100644 --- a/lustre/tests/sanity.sh +++ b/lustre/tests/sanity.sh @@ -3352,13 +3352,13 @@ test_43a() { test_mkdir -p $DIR/$tdir cp -p `which $MULTIOP` $DIR/$tdir/multiop || cp -p multiop $DIR/$tdir/multiop - MULTIOP_PROG=$DIR/$tdir/multiop multiop_bg_pause $TMP/test43.junk O_c || + MULTIOP_PROG=$DIR/$tdir/multiop multiop_bg_pause $TMP/$tfile.junk O_c || return 1 MULTIOP_PID=$! $MULTIOP $DIR/$tdir/multiop Oc && error "expected error, got success" kill -USR1 $MULTIOP_PID || return 2 wait $MULTIOP_PID || return 3 - rm $TMP/test43.junk + rm $TMP/$tfile.junk $DIR/$tdir/multiop } run_test 43a "open(RDWR) of file being executed should return -ETXTBSY" @@ -3367,13 +3367,13 @@ test_43b() { test_mkdir -p $DIR/$tdir cp -p `which $MULTIOP` $DIR/$tdir/multiop || cp -p multiop $DIR/$tdir/multiop - MULTIOP_PROG=$DIR/$tdir/multiop multiop_bg_pause $TMP/test43.junk O_c || + MULTIOP_PROG=$DIR/$tdir/multiop multiop_bg_pause $TMP/$tfile.junk O_c || return 1 MULTIOP_PID=$! $TRUNCATE $DIR/$tdir/multiop 0 && error "expected error, got success" kill -USR1 $MULTIOP_PID || return 2 wait $MULTIOP_PID || return 3 - rm $TMP/test43.junk + rm $TMP/$tfile.junk $DIR/$tdir/multiop } run_test 43b "truncate of file being executed should return -ETXTBSY" -- 1.8.3.1