LU-2469 test: Skip failing ZFS tests

[fs/lustre-release.git] / lustre / tests / replay-ost-single.sh

diff --git a/lustre/tests/replay-ost-single.sh b/lustre/tests/replay-ost-single.sh
index 8606cbb..8babef8 100755 (executable)
--- a/lustre/tests/replay-ost-single.sh
+++ b/lustre/tests/replay-ost-single.sh
@@ -19,10 +19,6 @@ init_logging
 
 require_dsh_ost || exit 0
 
-# Tests that fail on uml
-CPU=`awk '/model/ {print $4}' /proc/cpuinfo`
-[ "$CPU" = "UML" ] && EXCEPT="$EXCEPT 6"
-
 # Skip these tests
 # BUG NUMBER: 
 ALWAYS_EXCEPT="$REPLAY_OST_SINGLE_EXCEPT"
@@ -30,6 +26,10 @@ ALWAYS_EXCEPT="$REPLAY_OST_SINGLE_EXCEPT"
 #                                      
 [ "$SLOW" = "no" ] && EXCEPT_SLOW="5"
 
+[ $(facet_fstype $SINGLEMDS) = "zfs" ] &&
+# bug number for skipped test:      LU-2285
+       ALWAYS_EXCEPT="$ALWAYS_EXCEPT 3"
+
 build_test_filter
 
 check_and_setup_lustre
@@ -164,6 +164,7 @@ test_5() {
     rc=$?
     log "iozone rc=$rc"
     rm -f $TDIR/$tfile
+    wait_delete_completed_mds
     [ $rc -eq 0 ] || error "iozone failed"
     return $rc
 }
@@ -367,6 +368,6 @@ test_8e() {
 }
 run_test 8e "Verify that ptlrpc resends request on -EINPROGRESS"
 
-complete $(basename $0) $SECONDS
+complete $SECONDS
 check_and_cleanup_lustre
 exit_status