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

qa/tasks/ragweed.py: use str methods of helper from string module

Browse Source 
in Python3, some methods offered by `string` module are now member
method of `str` class, and `string.uppercase` is renamed to
`string.ascii_uppercase` in Python2 and Python3. so let's update
accordingly.

Signed-off-by: Kefu Chai <kchai@redhat.com>
This commit is contained in:
Kefu Chai 2020-04-06 15:12:46 +08:00
parent 7202d8a72c
commit 6ad2ca9767
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
qa/tasks/ragweed.py
View File

@ -100,7 +100,7 @@ def _config_user(ragweed_conf, section, user):
ragweed_conf[section].setdefault('user_id', user)
ragweed_conf[section].setdefault('email', '{user}+test@test.test'.format(user=user))
ragweed_conf[section].setdefault('display_name', 'Mr. {user}'.format(user=user))
ragweed_conf[section].setdefault('access_key', ''.join(random.choice(string.uppercase) for i in range(20)))
ragweed_conf[section].setdefault('access_key', ''.join(random.choice(string.ascii_uppercase) for i in range(20)))
ragweed_conf[section].setdefault('secret_key', base64.b64encode(os.urandom(40)))
@ -112,7 +112,7 @@ def create_users(ctx, config, run_stages):
assert isinstance(config, dict)
for client, properties in config['config'].items():
run_stages[client] = string.split(properties.get('stages', 'prepare,check'), ',')
run_stages[client] = properties.get('stages', 'prepare,check').split(',')
log.info('Creating rgw users...')
testdir = teuthology.get_testdir(ctx)
@ -248,7 +248,7 @@ def run_tests(ctx, config, run_stages):
testdir = teuthology.get_testdir(ctx)
attrs = ["!fails_on_rgw"]
for client, client_config in config.items():
stages = string.join(run_stages[client], ',')
stages = ','.join(run_stages[client])
args = [
'RAGWEED_CONF={tdir}/archive/ragweed.{client}.conf'.format(tdir=testdir, client=client),
'RAGWEED_STAGES={stages}'.format(stages=stages),