From: Mykola Golub Date: Fri, 27 Nov 2015 06:23:55 +0000 (+0200) Subject: tests: workunits should not have ./ (assume it in $PATH) X-Git-Tag: v10.0.2~164^2~1 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=2b252d294d6685e26d8dcc2933382f065ce7718f;p=ceph.git tests: workunits should not have ./ (assume it in $PATH) Signed-off-by: Mykola Golub --- diff --git a/src/test/mon/misc.sh b/src/test/mon/misc.sh index c11c0eb0d5d5..b7d823339b51 100755 --- a/src/test/mon/misc.sh +++ b/src/test/mon/misc.sh @@ -43,44 +43,44 @@ function TEST_osd_pool_get_set() { local flag for flag in hashpspool nodelete nopgchange nosizechange write_fadvise_dontneed noscrub nodeep-scrub; do if [ $flag = hashpspool ]; then - ./ceph osd dump | grep 'pool ' | grep $flag || return 1 + ceph osd dump | grep 'pool ' | grep $flag || return 1 else - ! ./ceph osd dump | grep 'pool ' | grep $flag || return 1 + ! ceph osd dump | grep 'pool ' | grep $flag || return 1 fi - ./ceph osd pool set $TEST_POOL $flag 0 || return 1 - ! ./ceph osd dump | grep 'pool ' | grep $flag || return 1 - ./ceph osd pool set $TEST_POOL $flag 1 || return 1 - ./ceph osd dump | grep 'pool ' | grep $flag || return 1 - ./ceph osd pool set $TEST_POOL $flag false || return 1 - ! ./ceph osd dump | grep 'pool ' | grep $flag || return 1 - ./ceph osd pool set $TEST_POOL $flag false || return 1 + ceph osd pool set $TEST_POOL $flag 0 || return 1 + ! ceph osd dump | grep 'pool ' | grep $flag || return 1 + ceph osd pool set $TEST_POOL $flag 1 || return 1 + ceph osd dump | grep 'pool ' | grep $flag || return 1 + ceph osd pool set $TEST_POOL $flag false || return 1 + ! ceph osd dump | grep 'pool ' | grep $flag || return 1 + ceph osd pool set $TEST_POOL $flag false || return 1 # check that setting false twice does not toggle to true (bug) - ! ./ceph osd dump | grep 'pool ' | grep $flag || return 1 - ./ceph osd pool set $TEST_POOL $flag true || return 1 - ./ceph osd dump | grep 'pool ' | grep $flag || return 1 + ! ceph osd dump | grep 'pool ' | grep $flag || return 1 + ceph osd pool set $TEST_POOL $flag true || return 1 + ceph osd dump | grep 'pool ' | grep $flag || return 1 # cleanup - ./ceph osd pool set $TEST_POOL $flag 0 || return 1 + ceph osd pool set $TEST_POOL $flag 0 || return 1 done - local size=$(./ceph osd pool get $TEST_POOL size|awk '{print $2}') - local min_size=$(./ceph osd pool get $TEST_POOL min_size|awk '{print $2}') + local size=$(ceph osd pool get $TEST_POOL size|awk '{print $2}') + local min_size=$(ceph osd pool get $TEST_POOL min_size|awk '{print $2}') #replicated pool size restrict in 1 and 10 - ! ./ceph osd pool set $TEST_POOL 11 || return 1 + ! ceph osd pool set $TEST_POOL 11 || return 1 #replicated pool min_size must be between in 1 and size - ! ./ceph osd pool set $TEST_POOL min_size $(expr $size + 1) || return 1 - ! ./ceph osd pool set $TEST_POOL min_size 0 || return 1 + ! ceph osd pool set $TEST_POOL min_size $(expr $size + 1) || return 1 + ! ceph osd pool set $TEST_POOL min_size 0 || return 1 local ecpool=erasepool - ./ceph osd pool create $ecpool 12 12 erasure default || return 1 + ceph osd pool create $ecpool 12 12 erasure default || return 1 #erasue pool size=k+m, min_size=k - local size=$(./ceph osd pool get $ecpool size|awk '{print $2}') - local k=$(./ceph osd pool get $ecpool min_size|awk '{print $2}') + local size=$(ceph osd pool get $ecpool size|awk '{print $2}') + local k=$(ceph osd pool get $ecpool min_size|awk '{print $2}') #erasure pool size can't change - ! ./ceph osd pool set $ecpool size $(expr $size + 1) || return 1 + ! ceph osd pool set $ecpool size $(expr $size + 1) || return 1 #erasure pool min_size must be between in k and size - ./ceph osd pool set $ecpool min_size $(expr $k + 1) || return 1 - ! ./ceph osd pool set $ecpool min_size $(expr $k - 1) || return 1 - ! ./ceph osd pool set $ecpool min_size $(expr $size + 1) || return 1 + ceph osd pool set $ecpool min_size $(expr $k + 1) || return 1 + ! ceph osd pool set $ecpool min_size $(expr $k - 1) || return 1 + ! ceph osd pool set $ecpool min_size $(expr $size + 1) || return 1 teardown $dir || return 1 }