From bf9912c3b8f9b0c788fda642a04cbc5410ec5ee7 Mon Sep 17 00:00:00 2001 From: Nathaniel Clark Date: Tue, 18 Dec 2012 17:16:21 -0500 Subject: [PATCH] LU-2414 tests: cleanup replay-single/0c and 44c Switch from return codes to error messages in test_0c and test_44c. Signed-off-by: Nathaniel Clark Change-Id: I61895442fa52e2f7bff421e0b8309f0f11c97de8 Reviewed-on: http://review.whamcloud.com/4856 Reviewed-by: Bob Glossman Tested-by: Hudson Reviewed-by: Jian Yu Tested-by: Maloo Reviewed-by: Andreas Dilger --- lustre/tests/replay-single.sh | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/lustre/tests/replay-single.sh b/lustre/tests/replay-single.sh index 24653fc..568e26b 100755 --- a/lustre/tests/replay-single.sh +++ b/lustre/tests/replay-single.sh @@ -69,7 +69,7 @@ test_0c() { zconf_mount `hostname` $MOUNT || error "mount fails" client_up || error "post-failover df failed" # file shouldn't exist if replay-barrier works as expected - rm $DIR/$tfile && return 1 + rm $DIR/$tfile && error "File exists and it shouldn't" return 0 } run_test 0c "check replay-barrier" @@ -945,15 +945,15 @@ test_44b() { run_test 44b "race in target handle connect" test_44c() { - replay_barrier $SINGLEMDS - createmany -m $DIR/$tfile-%d 100 + replay_barrier $SINGLEMDS + createmany -m $DIR/$tfile-%d 100 || error "failed to create directories" #define OBD_FAIL_TGT_RCVG_FLAG 0x712 - do_facet $SINGLEMDS "lctl set_param fail_loc=0x80000712" - fail_abort $SINGLEMDS - unlinkmany $DIR/$tfile-%d 100 && return 1 - fail $SINGLEMDS - unlinkmany $DIR/$tfile-%d 100 && return 1 - return 0 + do_facet $SINGLEMDS "lctl set_param fail_loc=0x80000712" + fail_abort $SINGLEMDS + unlinkmany $DIR/$tfile-%d 100 && error "unliked after fail abort" + fail $SINGLEMDS + unlinkmany $DIR/$tfile-%d 100 && error "unliked after fail" + return 0 } run_test 44c "race in target handle connect" -- 1.8.3.1