From f70e206e1397e3af471afa80bd2f7d72f0d6a052 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Mon, 23 Dec 2019 12:30:01 -0600 Subject: [PATCH] qa/workunits/rados/test_large_omap_detection: py3-ify Signed-off-by: Sage Weil --- qa/workunits/rados/test_large_omap_detection.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/qa/workunits/rados/test_large_omap_detection.py b/qa/workunits/rados/test_large_omap_detection.py index 84e08088a4a59..b5c81a8d86b9b 100755 --- a/qa/workunits/rados/test_large_omap_detection.py +++ b/qa/workunits/rados/test_large_omap_detection.py @@ -33,20 +33,20 @@ def init(): print("\nCluster ID: " + cluster.get_fsid()) cluster.create_pool('large-omap-test-pool') ioctx = cluster.open_ioctx('large-omap-test-pool') - ioctx.write_full('large-omap-test-object1', "Lorem ipsum") + ioctx.write_full('large-omap-test-object1', b"Lorem ipsum") op = ioctx.create_write_op() keys = [] values = [] for x in range(20001): keys.append(str(x)) - values.append("X") + values.append(b"X") ioctx.set_omap(op, tuple(keys), tuple(values)) ioctx.operate_write_op(op, 'large-omap-test-object1', 0) ioctx.release_write_op(op) - ioctx.write_full('large-omap-test-object2', "Lorem ipsum dolor") + ioctx.write_full('large-omap-test-object2', b"Lorem ipsum dolor") op = ioctx.create_write_op() buffer = ("Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do " @@ -59,9 +59,9 @@ def init(): keys = [] values = [] - for x in xrange(20000): + for x in range(20000): keys.append(str(x)) - values.append(buffer) + values.append(buffer.encode()) ioctx.set_omap(op, tuple(keys), tuple(values)) ioctx.operate_write_op(op, 'large-omap-test-object2', 0) @@ -115,7 +115,7 @@ def check_health_output(): RETRIES += 1 output = subprocess.check_output(["ceph", "health", "detail"]) for line in output.splitlines(): - result += int(line.find('2 large omap objects') != -1) + result += int(line.find(b'2 large omap objects') != -1) time.sleep(10) if result != 2: -- 2.39.5