LU-684 tests: replace dev_read_only patch with dm-flakey

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

diff --git a/lustre/tests/conf-sanity.sh b/lustre/tests/conf-sanity.sh
index cb2daaf..e1d9c0c 100644 (file)
--- a/lustre/tests/conf-sanity.sh
+++ b/lustre/tests/conf-sanity.sh
@@ -571,22 +571,6 @@ test_9() {
 }
 run_test 9 "test ptldebug and subsystem for mkfs"
 
-is_blkdev () {
-       local facet=$1
-       local dev=$2
-       local size=${3:-""}
-
-       local rc=0
-       do_facet $facet "test -b $dev" || rc=1
-       if [[ "$size" ]]; then
-               local in=$(do_facet $facet "dd if=$dev of=/dev/null bs=1k \
-                          count=1 skip=$size 2>&1" |
-                       awk '($3 == "in") { print $1 }')
-               [[ $in  = "1+0" ]] || rc=1
-       fi
-       return $rc
-}
-
 #
 # Test 16 was to "verify that lustre will correct the mode of OBJECTS".
 # But with new MDS stack we don't care about the mode of local objects
@@ -7553,7 +7537,7 @@ test_106() {
 #shows that osp code is buggy
        do_facet mds1 $LCTL set_param fail_loc=0 fail_val=0
 
-       cleanupall
+       stopall
 }
 run_test 106 "check osp llog processing when catalog is wrapped"
 
@@ -8096,4 +8080,5 @@ OSTSIZE=$STORED_OSTSIZE
 reformat
 
 complete $SECONDS
+check_and_cleanup_lustre
 exit_status