LU-3880 tests: Allow error_ignore to accept any bug number

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

diff --git a/lustre/tests/sanity.sh b/lustre/tests/sanity.sh
index 9e1deb6..c4035d4 100644 (file)
--- a/lustre/tests/sanity.sh
+++ b/lustre/tests/sanity.sh
@@ -6689,7 +6689,7 @@ test_116a() { # was previously test_116()
                echo "ok"
        else
                echo "failed - QOS mode won't be used"
-               error_ignore 0000 "QOS imbalance criteria not met"
+               skip "QOS imbalance criteria not met"
                simple_cleanup_common
                return
        fi
@@ -6743,8 +6743,7 @@ test_116a() { # was previously test_116()
        [ $MINC -gt 0 ] &&
                echo "Wrote ${FILL}% more files to larger OST $MAXI1"
        [ $MAXC -gt $MINC ] ||
-               error_ignore 0000 "stripe QOS didn't balance free space"
-
+               error_ignore LU-9 "stripe QOS didn't balance free space"
        simple_cleanup_common
 }
 run_test 116a "stripe QOS: free space balance ==================="
@@ -9303,12 +9302,11 @@ test_156() {
     BEFORE=`roc_hit`
     cat $file >/dev/null
     AFTER=`roc_hit`
-    if ! let "AFTER - BEFORE == 0"; then
-        error_ignore 20762 "IN CACHE: before: $BEFORE, after: $AFTER"
-    else
-        log "cache hits:: before: $BEFORE, after: $AFTER"
-    fi
-
+       if ! let "AFTER - BEFORE == 0"; then
+               error_ignore bz20762 "IN CACHE: before: $BEFORE, after: $AFTER"
+       else
+               log "cache hits:: before: $BEFORE, after: $AFTER"
+       fi
 
     log "Turn on the read cache and turn off the write cache"
     set_cache read on
@@ -9322,11 +9320,11 @@ test_156() {
     cancel_lru_locks osc
     cat $file >/dev/null
     AFTER=`roc_hit`
-    if ! let "AFTER - BEFORE == 0"; then
-        error_ignore 20762 "IN CACHE: before: $BEFORE, after: $AFTER"
-    else
-        log "cache hits:: before: $BEFORE, after: $AFTER"
-    fi
+       if ! let "AFTER - BEFORE == 0"; then
+               error_ignore bz20762 "IN CACHE: before: $BEFORE, after: $AFTER"
+       else
+               log "cache hits:: before: $BEFORE, after: $AFTER"
+       fi
 
     log "Read again; it should be satisfied from the cache."
     BEFORE=`roc_hit`
@@ -9346,7 +9344,7 @@ run_test 156 "Verification of tunables ============================"
 #Changelogs
 err17935 () {
        if [ $MDSCOUNT -gt 1 ]; then
-               error_ignore 17935 $*
+               error_ignore bz17935 $*
        else
                error $*
        fi