RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2024-12-26 21:43:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

qa/workunits: Python 3 compat fixes for mon/test_mon_config_key.py

Browse Source 
Signed-off-by: Anirudha Bose <ani07nov@gmail.com>
This commit is contained in:
Anirudha Bose 2016-08-18 19:15:54 +05:30
parent f937d3464b
commit 4409bb5aef
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
qa/workunits/mon/test_mon_config_key.py
View File

@ -78,10 +78,10 @@ def run_cmd(cmd, expects=0):
try: try:
(out, err) = proc.communicate() (out, err) = proc.communicate()
if out is not None: if out is not None:
stdout += str(out).split('\n') stdout += out.decode().split('\n')
cmdlog.debug('stdout: {s}'.format(s=out)) cmdlog.debug('stdout: {s}'.format(s=out))
if err is not None: if err is not None:
stdout += str(err).split('\n') stdout += err.decode().split('\n')
cmdlog.debug('stderr: {s}'.format(s=err)) cmdlog.debug('stderr: {s}'.format(s=err))
except ValueError: except ValueError:
ret = proc.wait() ret = proc.wait()
@ -118,7 +118,7 @@ def destroy_tmp_file(fpath):
def write_data_file(data, rnd): def write_data_file(data, rnd):
file_path = gen_tmp_file_path(rnd) file_path = gen_tmp_file_path(rnd)
data_file = open(file_path, 'wr+') data_file = open(file_path, 'a+')
data_file.truncate() data_file.truncate()
data_file.write(data) data_file.write(data)
data_file.close() data_file.close()
@ -126,7 +126,9 @@ def write_data_file(data, rnd):
#end write_data_file #end write_data_file
def choose_random_op(rnd): def choose_random_op(rnd):
op = rnd.choice(OPS.keys()) op = rnd.choice(
list(OPS.keys())
)
sop = rnd.choice(OPS[op]) sop = rnd.choice(OPS[op])
return (op, sop) return (op, sop)
@ -206,7 +208,7 @@ def main():
expected = 0 # the store just overrides the value if the key exists expected = 0 # the store just overrides the value if the key exists
#end if sop == 'existing' #end if sop == 'existing'
elif sop == 'new': elif sop == 'new':
for x in xrange(0, 10): for x in range(0, 10):
key = gen_key(rnd) key = gen_key(rnd)
if key not in CONFIG_EXISTING: if key not in CONFIG_EXISTING:
break break
@ -263,8 +265,8 @@ def main():
'key \'{k_}\' not in CONFIG_EXISTING'.format(k_=key) 'key \'{k_}\' not in CONFIG_EXISTING'.format(k_=key)
if sop == 'enoent': if sop == 'enoent':
for x in xrange(0, 10): for x in range(0, 10):
key = base64.b64encode(os.urandom(20)) key = base64.b64encode(os.urandom(20)).decode()
if key not in CONFIG_EXISTING: if key not in CONFIG_EXISTING:
break break
key = None key = None
@ -301,8 +303,8 @@ def main():
'key \'{k_}\' not in CONFIG_EXISTING'.format(k_=key) 'key \'{k_}\' not in CONFIG_EXISTING'.format(k_=key)
if sop == 'enoent': if sop == 'enoent':
for x in xrange(0, 10): for x in range(0, 10):
key = base64.b64encode(os.urandom(20)) key = base64.b64encode(os.urandom(20)).decode()
if key not in CONFIG_EXISTING: if key not in CONFIG_EXISTING:
break break
key = None key = None
@ -335,8 +337,8 @@ def main():
'key \'{k_}\' not in CONFIG_EXISTING'.format(k_=key) 'key \'{k_}\' not in CONFIG_EXISTING'.format(k_=key)
if sop == 'enoent': if sop == 'enoent':
for x in xrange(0, 10): for x in range(0, 10):
key = base64.b64encode(os.urandom(20)) key = base64.b64encode(os.urandom(20)).decode()
if key not in CONFIG_EXISTING: if key not in CONFIG_EXISTING:
break break
key = None key = None