]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
qa/workunits/rados/test_large_omap_detection: py3-ify 32405/head
authorSage Weil <sage@redhat.com>
Mon, 23 Dec 2019 18:30:01 +0000 (12:30 -0600)
committerSage Weil <sage@redhat.com>
Mon, 23 Dec 2019 19:55:08 +0000 (13:55 -0600)
Signed-off-by: Sage Weil <sage@redhat.com>
qa/workunits/rados/test_large_omap_detection.py

index 84e08088a4a59da107f6c1582854f7a7281e42b9..b5c81a8d86b9bbd7903f55ef1d58a3853a73b1c8 100755 (executable)
@@ -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: