From 6236e7db22edac7b51fc6329188b6afa74f3fc78 Mon Sep 17 00:00:00 2001 From: Yehuda Sadeh Date: Thu, 17 Nov 2011 16:53:21 -0800 Subject: [PATCH] testswift: fix config --- testswift.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/testswift.py b/testswift.py index b1775f96c16..65ff7df8648 100644 --- a/testswift.py +++ b/testswift.py @@ -40,9 +40,10 @@ def download(ctx, config): def _config_user(testswift_conf, account, user, suffix): testswift_conf['func_test'].setdefault('account{s}'.format(s=suffix), account); + testswift_conf['func_test'].setdefault('username{s}'.format(s=suffix), user); testswift_conf['func_test'].setdefault('email{s}'.format(s=suffix), '{account}+test@test.test'.format(account=account)) testswift_conf['func_test'].setdefault('display_name{s}'.format(s=suffix), 'Mr. {account} {user}'.format(account=account, user=user)) - testswift_conf['func_test'].setdefault('secret_key{s}'.format(s=suffix), base64.b64encode(os.urandom(40))) + testswift_conf['func_test'].setdefault('password{s}'.format(s=suffix), base64.b64encode(os.urandom(40))) @contextlib.contextmanager def create_users(ctx, config): @@ -63,7 +64,7 @@ def create_users(ctx, config): 'user', 'create', '--subuser', '{account}:{user}'.format(account=testswift_conf['func_test']['account{s}'.format(s=suffix)],user=user), '--display-name', testswift_conf['func_test']['display_name{s}'.format(s=suffix)], - '--secret', testswift_conf['func_test']['secret_key{s}'.format(s=suffix)], + '--secret', testswift_conf['func_test']['password{s}'.format(s=suffix)], '--email', testswift_conf['func_test']['email{s}'.format(s=suffix)], '--key-type', 'swift', ], -- 2.39.5