From bc80c8c7f9e94a6d71f034abe487b8043645a48a Mon Sep 17 00:00:00 2001 From: Jason Dillaman Date: Mon, 19 Feb 2018 14:47:46 -0500 Subject: [PATCH] qa/workunits/rbd: remove sanity check in journal.sh test When the OSDs are being concurrently thrashed, this can result in sporadic failures due to the admin socket disappearing. Signed-off-by: Jason Dillaman --- qa/workunits/rbd/journal.sh | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/qa/workunits/rbd/journal.sh b/qa/workunits/rbd/journal.sh index 157e7ad8af5..d35ea189a84 100755 --- a/qa/workunits/rbd/journal.sh +++ b/qa/workunits/rbd/journal.sh @@ -13,7 +13,7 @@ function list_tests() function usage() { - echo "usage: $0 [-h|-l|-t [-t ...] [--no-sanity-check] [--no-cleanup]]" + echo "usage: $0 [-h|-l|-t [-t ...] [--no-cleanup]]" } function expect_false() @@ -273,7 +273,6 @@ TESTS+=" rbd_feature" tests_to_run=() -sanity_check=true cleanup=true while [[ $# -gt 0 ]]; do @@ -283,9 +282,6 @@ while [[ $# -gt 0 ]]; do "-l" ) do_list=1 ;; - "--no-sanity-check" ) - sanity_check=false - ;; "--no-cleanup" ) cleanup=false ;; @@ -322,15 +318,9 @@ if test -z "$tests_to_run" ; then fi for i in $tests_to_run; do - if $sanity_check ; then - wait_for_clean - fi set -x test_${i} set +x done -if $sanity_check ; then - wait_for_clean -fi echo OK -- 2.39.5