From 4fe245cc2f2de7cab03121b19de0e77df5a9648e Mon Sep 17 00:00:00 2001 From: Ilya Dryomov Date: Tue, 26 Nov 2019 12:06:58 +0100 Subject: [PATCH] qa: update krbd tests for python3 There is no /usr/bin/python symlink in CentOS 8 even if python2 is installed. Signed-off-by: Ilya Dryomov --- qa/rbd/krbd_huge_image.t | 2 +- qa/rbd/krbd_msgr_segments.t | 2 +- qa/rbd/krbd_whole_object_zeroout.t | 2 +- qa/workunits/rbd/krbd_data_pool.sh | 6 +++--- qa/workunits/rbd/krbd_exclusive_option.sh | 6 +++--- qa/workunits/rbd/krbd_fallocate.sh | 10 +++++----- qa/workunits/rbd/krbd_namespaces.sh | 2 +- 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/qa/rbd/krbd_huge_image.t b/qa/rbd/krbd_huge_image.t index 9fff1d9d44ea..e0ce6a954128 100644 --- a/qa/rbd/krbd_huge_image.t +++ b/qa/rbd/krbd_huge_image.t @@ -1,6 +1,6 @@ $ get_field() { - > rbd info --format=json $1 | python -c "import sys, json; print json.load(sys.stdin)['$2']" + > rbd info --format=json $1 | python3 -c "import sys, json; print(json.load(sys.stdin)['$2'])" > } Write to first and last sectors and make sure we hit the right objects: diff --git a/qa/rbd/krbd_msgr_segments.t b/qa/rbd/krbd_msgr_segments.t index c373af5a236a..b89a921a160c 100644 --- a/qa/rbd/krbd_msgr_segments.t +++ b/qa/rbd/krbd_msgr_segments.t @@ -1,6 +1,6 @@ $ get_block_name_prefix() { - > rbd info --format=json $1 | python -c "import sys, json; print json.load(sys.stdin)['block_name_prefix']" + > rbd info --format=json $1 | python3 -c "import sys, json; print(json.load(sys.stdin)['block_name_prefix'])" > } Short segments: diff --git a/qa/rbd/krbd_whole_object_zeroout.t b/qa/rbd/krbd_whole_object_zeroout.t index 3530f93e6004..eaee487a1275 100644 --- a/qa/rbd/krbd_whole_object_zeroout.t +++ b/qa/rbd/krbd_whole_object_zeroout.t @@ -1,6 +1,6 @@ $ get_block_name_prefix() { - > rbd info --format=json $1 | python -c "import sys, json; print json.load(sys.stdin)['block_name_prefix']" + > rbd info --format=json $1 | python3 -c "import sys, json; print(json.load(sys.stdin)['block_name_prefix'])" > } $ rbd create --size 200M img diff --git a/qa/workunits/rbd/krbd_data_pool.sh b/qa/workunits/rbd/krbd_data_pool.sh index e8fc8348c601..8eada88bb704 100755 --- a/qa/workunits/rbd/krbd_data_pool.sh +++ b/qa/workunits/rbd/krbd_data_pool.sh @@ -98,7 +98,7 @@ function get_num_clones() { local pool=$1 rados -p $pool --format=json df | - python -c 'import sys, json; print json.load(sys.stdin)["pools"][0]["num_object_clones"]' + python3 -c 'import sys, json; print(json.load(sys.stdin)["pools"][0]["num_object_clones"])' } ceph osd pool create repdata 24 24 @@ -119,8 +119,8 @@ for pool in rbd rbdnonzero; do rbd create --size 200 --data-pool ecdata $pool/img3 done -IMAGE_SIZE=$(rbd info --format=json img1 | python -c 'import sys, json; print json.load(sys.stdin)["size"]') -OBJECT_SIZE=$(rbd info --format=json img1 | python -c 'import sys, json; print json.load(sys.stdin)["object_size"]') +IMAGE_SIZE=$(rbd info --format=json img1 | python3 -c 'import sys, json; print(json.load(sys.stdin)["size"])') +OBJECT_SIZE=$(rbd info --format=json img1 | python3 -c 'import sys, json; print(json.load(sys.stdin)["object_size"])') NUM_OBJECTS=$((IMAGE_SIZE / OBJECT_SIZE)) [[ $((IMAGE_SIZE % OBJECT_SIZE)) -eq 0 ]] diff --git a/qa/workunits/rbd/krbd_exclusive_option.sh b/qa/workunits/rbd/krbd_exclusive_option.sh index 42587dfd85fd..543c33b42459 100755 --- a/qa/workunits/rbd/krbd_exclusive_option.sh +++ b/qa/workunits/rbd/krbd_exclusive_option.sh @@ -24,10 +24,10 @@ function assert_locked() { local actual actual="$(rados -p rbd --format=json lock info rbd_header.$IMAGE_ID rbd_lock | - python -m json.tool)" + python3 -m json.tool)" local expected - expected="$(cat <