minor message cleanup

[fs/lustre-release.git] / lustre / tests / conf-sanity.sh

diff --git a/lustre/tests/conf-sanity.sh b/lustre/tests/conf-sanity.sh
index 8626370..d6087f6 100644 (file)
--- a/lustre/tests/conf-sanity.sh
+++ b/lustre/tests/conf-sanity.sh
@@ -14,8 +14,8 @@ ONLY=${ONLY:-"$*"}
 # These tests don't apply to mountconf
 MOUNTCONFSKIP="9 10 11 12 13 13b 14 15"
 
-# bug number for skipped test:                     2661 13709 10510 12743
-ALWAYS_EXCEPT=" $CONF_SANITY_EXCEPT $MOUNTCONFSKIP 16   22    23    36"
+# bug number for skipped test:                     2661 13709 10510 13710 12743
+ALWAYS_EXCEPT=" $CONF_SANITY_EXCEPT $MOUNTCONFSKIP 16   22    23    33    36"
 # UPDATE THE COMMENT ABOVE WITH BUG NUMBERS WHEN CHANGING ALWAYS_EXCEPT!
 
 SRCDIR=`dirname $0`
@@ -766,8 +766,8 @@ test_21c() {
 run_test 21c "start mds between two osts, stop mds last"
 
 test_22() {
-        #reformat to remove all logs
-        reformat
+       #reformat to remove all logs
+       reformat
        start_mds
        echo Client mount before any osts are in the logs
        mount_client $MOUNT
@@ -821,6 +821,9 @@ test_23() {
 #run_test 23 "interrupt client during recovery mount delay"
 
 test_24a() {
+       #set up fs1 
+       gen_config
+       #set up fs2
        local fs2mds_HOST=$mds_HOST
        local fs2ost_HOST=$ost_HOST
        [ -n "$ost1_HOST" ] && fs2ost_HOST=$ost1_HOST
@@ -1277,7 +1280,7 @@ test_34c() {
        cleanup
        return 0        
 }
-run_test 34c "force umount with failed mds should be normal"
+run_test 34c "force umount with failed ost should be normal"
 
 test_35() { # bug 12459
        setup
@@ -1292,7 +1295,7 @@ test_35() { # bug 12459
        log "Wait for RECONNECT_INTERVAL seconds (10s)"
        sleep 10
 
-       MSG="conf-sanity.sh test_33 `date +%F%kh%Mm%Ss`"
+       MSG="conf-sanity.sh test_35 `date +%F%kh%Mm%Ss`"
        $LCTL clear
        log "$MSG"
        log "Stopping the MDT:"