RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-04 02:02:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

test/pybind: drop py2 support

Browse Source 
Signed-off-by: Kefu Chai <kchai@redhat.com>
This commit is contained in:
Kefu Chai 2020-06-28 19:16:17 +08:00
parent cf7632cfd5
commit 51efa33ac8
1 changed files with 3 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/test/pybind/test_rados.py
View File

@ -14,9 +14,6 @@ import os
import re
import sys
# Are we running Python 2.x
_python2 = sys.version_info[0] < 3
def test_rados_init_error():
assert_raises(Error, Rados, conffile='', rados_id='admin',
name='client.admin')
@ -160,20 +157,13 @@ class TestRados(object):
self.rados.delete_pool('foo')
def test_create_utf8(self):
if _python2:
# Use encoded bytestring
poolname = b"\351\273\204"
else:
poolname = "\u9ec4"
poolname = "\u9ec4"
self.rados.create_pool(poolname)
assert self.rados.pool_exists(u"\u9ec4")
self.rados.delete_pool(poolname)
def test_pool_lookup_utf8(self):
if _python2:
poolname = u'\u9ec4'
else:
poolname = '\u9ec4'
poolname = '\u9ec4'
self.rados.create_pool(poolname)
try:
poolid = self.rados.pool_lookup(poolname)
@ -1203,11 +1193,7 @@ class TestCommand(object):
eq(out['bytes_written'], cmd['count'])
def test_ceph_osd_pool_create_utf8(self):
if _python2:
# Use encoded bytestring
poolname = b"\351\273\205"
else:
poolname = "\u9ec5"
poolname = "\u9ec5"
cmd = {"prefix": "osd pool create", "pg_num": 16, "pool": poolname}
ret, buf, out = self.rados.mon_command(json.dumps(cmd), b'')