Merge "Removes trailing blank in trust show"
This commit is contained in:
commit
d26650b57d
@ -144,7 +144,7 @@ class CreateTrust(show.ShowOne):
|
||||
|
||||
# Format roles into something sensible
|
||||
roles = trust._info.pop('roles')
|
||||
msg = ''.join([r['name'] + ' ' for r in roles])
|
||||
msg = ' '.join(r['name'] for r in roles)
|
||||
trust._info['roles'] = msg
|
||||
|
||||
return zip(*sorted(six.iteritems(trust._info)))
|
||||
@ -215,7 +215,7 @@ class ShowTrust(show.ShowOne):
|
||||
|
||||
# Format roles into something sensible
|
||||
roles = trust._info.pop('roles')
|
||||
msg = ''.join([r['name'] + ' ' for r in roles])
|
||||
msg = ' '.join(r['name'] for r in roles)
|
||||
trust._info['roles'] = msg
|
||||
|
||||
return zip(*sorted(six.iteritems(trust._info)))
|
||||
|
@ -107,7 +107,7 @@ class TestTrustCreate(TestTrust):
|
||||
identity_fakes.trust_id,
|
||||
identity_fakes.trust_impersonation,
|
||||
identity_fakes.project_id,
|
||||
identity_fakes.role_name + ' ',
|
||||
identity_fakes.role_name,
|
||||
identity_fakes.user_id,
|
||||
identity_fakes.user_id
|
||||
)
|
||||
@ -222,7 +222,7 @@ class TestTrustShow(TestTrust):
|
||||
identity_fakes.trust_id,
|
||||
identity_fakes.trust_impersonation,
|
||||
identity_fakes.project_id,
|
||||
identity_fakes.role_name + ' ',
|
||||
identity_fakes.role_name,
|
||||
identity_fakes.user_id,
|
||||
identity_fakes.user_id
|
||||
)
|
||||
|
Loading…
Reference in New Issue
Block a user