LU-13718 tests: add LU numbers to skipped tests

Some tests in ALWAYS_EXCEPT variable do not contain LU- numbers in
description. Also tests formatting inconsistent (mixed tabs and
spaces in one line).

This patch adds missing numbers and corrects formatting. This
improvement reduce time to find reasons why test was skipped and let
parse code to build table with skipped tests list.

Test-Parameters: trivial testlist=sanity-lfsck mdscount=2 mdtcount=8 osscount=1 ostcount=4
Signed-off-by: Vikentsi Lapa <vlapa@whamcloud.com>
Change-Id: Iada59d1e01b8ecd07af91157abef483df7715178
Reviewed-on: https://review.whamcloud.com/39217
Reviewed-by: James Nunez <jnunez@whamcloud.com>
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Wei Liu <sarah@whamcloud.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>

diff --git a/lustre/tests/sanity-lfsck.sh b/lustre/tests/sanity-lfsck.sh
index bddd2ba..4706337 100644 (file)
--- a/lustre/tests/sanity-lfsck.sh
+++ b/lustre/tests/sanity-lfsck.sh
@@ -17,18 +17,64 @@ ALWAYS_EXCEPT="$SANITY_LFSCK_EXCEPT "
 
 # DNE does not support striped directory on zfs-based backend yet.
 [ $(facet_fstype $SINGLEMDS) != ldiskfs ] &&
-#Bug number for excepting test
-       ALWAYS_EXCEPT+=" 31"
+
+# bug number for skipped test: LU-5855 LU-5855 LU-5855 LU-5855
+       ALWAYS_EXCEPT+="        31a     31b     31c     31d"
+# bug number for skipped test: LU-5855 LU-5855 LU-5855 LU-5855
+       ALWAYS_EXCEPT+="        31e     31f     31g     31h"
 # UPDATE THE COMMENT ABOVE WITH BUG NUMBERS WHEN CHANGING ALWAYS_EXCEPT!
 
 [[ $(lustre_version_code $SINGLEMDS) -le $(version_code 2.4.90) ]] &&
-       ALWAYS_EXCEPT="$ALWAYS_EXCEPT 2c"
+# bug number for skipped test: LU-4165
+       ALWAYS_EXCEPT+="        2c"
 
 [[ $(lustre_version_code ost1) -lt $(version_code 2.5.55) ]] &&
-       ALWAYS_EXCEPT="$ALWAYS_EXCEPT 11 12 13 14 15 16 17 18 19 20 21"
+# bug number for skipped test: LU-1267
+       ALWAYS_EXCEPT+="        11"
+# bug number for skipped test: LU-3950
+       ALWAYS_EXCEPT+="        12"
+# bug number for skipped test: LU-3593
+       ALWAYS_EXCEPT+="        13"
+# bug number for skipped test: LU-3590
+       ALWAYS_EXCEPT+="        14"
+# bug number for skipped test: LU-3591
+       ALWAYS_EXCEPT+="        15"
+# bug number for skipped test: LU-3594 LU-3594
+       ALWAYS_EXCEPT+="        16      17"
+# bug number for skipped test: LU-3336 LU-3336 LU-3336 LU-3336 LU-3336
+       ALWAYS_EXCEPT+="        18a     18b     18c     18d     18e"
+# bug number for skipped test: LU-3951 LU-3951
+       ALWAYS_EXCEPT+="        19a     19b"
+# bug number for skipped test: LU-4887 LU-4887
+       ALWAYS_EXCEPT+="        20      21"
 
 [[ $(lustre_version_code $SINGLEMDS) -lt $(version_code 2.6.50) ]] &&
-       ALWAYS_EXCEPT="$ALWAYS_EXCEPT 2d 2e 3 22 23 24 25 26 27 28 29 30 31"
+# bug number for skipped test: LU-4788
+       ALWAYS_EXCEPT+="        2d"
+# bug number for skipped test: LU-5511 LU-5511 LU-5511
+       ALWAYS_EXCEPT+="        2e      22a     22b"
+# bug number for skipped test: LU-4788
+       ALWAYS_EXCEPT+="        3"
+# bug number for skipped test: LU-5512 LU-5512 LU-5512
+       ALWAYS_EXCEPT+="        23a     23b     23c"
+# bug number for skipped test: LU-5513
+       ALWAYS_EXCEPT+="        24"
+# bug number for skipped test: LU-5515
+       ALWAYS_EXCEPT+="        25"
+# bug number for skipped test: LU-5516 LU-5516
+       ALWAYS_EXCEPT+="        26a     26b"
+# bug number for skipped test: LU-5516 LU-5516
+       ALWAYS_EXCEPT+="        27a     27b"
+# bug number for skipped test: LU-5506
+       ALWAYS_EXCEPT+="        28"
+# bug number for skipped test: LU-5517 LU-5517 LU-5517
+       ALWAYS_EXCEPT+="        29a     29b     29c"
+# bug number for skipped test: LU-5518
+       ALWAYS_EXCEPT+="        30"
+# bug number for skipped test: LU-5519 LU-5519 LU-5519 LU-5519
+       ALWAYS_EXCEPT+="        31a     31b     31c     31d"
+# bug number for skipped test: LU-5519 LU-5519 LU-5519 LU-5519
+       ALWAYS_EXCEPT+="        31e     31f     31g     31h"
 
 [ "$SLOW" = "no" ] && EXCEPT_SLOW=""
 build_test_filter

diff --git a/lustre/tests/sanity.sh b/lustre/tests/sanity.sh
index 3cb0d6b..7ba639d 100755 (executable)
--- a/lustre/tests/sanity.sh
+++ b/lustre/tests/sanity.sh
@@ -42,7 +42,7 @@ ALWAYS_EXCEPT="$SANITY_EXCEPT "
 # bug number for skipped test: LU-9693 LU-6493 LU-9693
 ALWAYS_EXCEPT+="               42a     42b     42c "
 # bug number:    LU-8411 LU-9054 LU-13314
-ALWAYS_EXCEPT+=" 407     312   56ob"
+ALWAYS_EXCEPT+=" 407     312     56ob"
 
 if $SHARED_KEY; then
        # bug number:    LU-9795 LU-9795 LU-9795 LU-9795