From d24d8186ffb1aad3a4286e2fbda63f79e90eb104 Mon Sep 17 00:00:00 2001 From: Nathaniel Clark Date: Thu, 6 Nov 2014 15:51:37 -0500 Subject: [PATCH] LU-2833 tests: Unexempt sanity/48a for zfs With LU-2449 being landed this test no longer fails on ZFS. Signed-off-by: Nathaniel Clark Change-Id: Ie82f25ac0152dee7972a8a210d8669b59798e9a7 Reviewed-on: http://review.whamcloud.com/12607 Tested-by: Jenkins Tested-by: Maloo Reviewed-by: Bob Glossman Reviewed-by: Isaac Huang Reviewed-by: Alex Zhuravlev Reviewed-by: Oleg Drokin --- lustre/tests/sanity.sh | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/lustre/tests/sanity.sh b/lustre/tests/sanity.sh index ef697d2..e5f2143 100644 --- a/lustre/tests/sanity.sh +++ b/lustre/tests/sanity.sh @@ -61,8 +61,8 @@ init_logging [ "$SLOW" = "no" ] && EXCEPT_SLOW="24o 27m 64b 68 71 77f 78 115 124b 230d" if [ $(facet_fstype $SINGLEMDS) = "zfs" ]; then - # bug number for skipped test: LU-1593 LU-2833 LU-1957 LU-2805 - ALWAYS_EXCEPT="$ALWAYS_EXCEPT 34h 48a 180 184c" + # bug number for skipped test: LU-1593 LU-1957 LU-2805 + ALWAYS_EXCEPT="$ALWAYS_EXCEPT 34h 180 184c" [ "$SLOW" = "no" ] && EXCEPT_SLOW="$EXCEPT_SLOW 51b 51ba" fi @@ -3796,6 +3796,10 @@ run_test 46 "dirtying a previously written page ================" # test_47 is removed "Device nodes check" is moved to test_28 test_48a() { # bug 2399 + [ $(facet_fstype $SINGLEMDS) = "zfs" ] && + [ $(lustre_version_code $SINGLEMDS) -lt $(version_code 2.3.63) ] && + skip "MDS prior to 2.3.63 handle ZFS dir .. incorrectly" && + return check_kernel_version 34 || return 0 test_mkdir -p $DIR/$tdir cd $DIR/$tdir -- 1.8.3.1