summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2014-09-29 03:44:33 +0000
committerGerrit Code Review <review@openstack.org>2014-09-29 03:44:33 +0000
commit4d1883c7bde87a0cd0bc9b26dbb6e52a7529108f (patch)
tree7a130810ab4f5a85c3a4313a75d2b39eceace118
parent7684d956476254d4a297e62d5a3debe27c461d7c (diff)
parentcf3fa3193ce1214f2e9950e640541f2697a3f17e (diff)
downloadpython-keystoneclient-4d1883c7bde87a0cd0bc9b26dbb6e52a7529108f.tar.gz
Merge "Change 'secrete' to 'secret'"
-rw-r--r--keystoneclient/tests/test_shell.py20
1 files changed, 10 insertions, 10 deletions
diff --git a/keystoneclient/tests/test_shell.py b/keystoneclient/tests/test_shell.py
index fe720fe..4be563b 100644
--- a/keystoneclient/tests/test_shell.py
+++ b/keystoneclient/tests/test_shell.py
@@ -235,7 +235,7 @@ class ShellTest(utils.TestCase):
# Old_style options
# Test case with one --tenant_id args present: ec2 creds
shell('user-create --name=FOO '
- '--pass=secrete --tenant_id=barrr --enabled=true')
+ '--pass=secret --tenant_id=barrr --enabled=true')
assert do_uc_mock.called
((a, b), c) = do_uc_mock.call_args
actual = (b.os_auth_url, b.os_password, b.os_tenant_id,
@@ -245,13 +245,13 @@ class ShellTest(utils.TestCase):
DEFAULT_TENANT_NAME, DEFAULT_USERNAME, '')
self.assertTrue(all([x == y for x, y in zip(actual, expect)]))
actual = (b.tenant_id, b.name, b.passwd, b.enabled)
- expect = ('barrr', 'FOO', 'secrete', 'true')
+ expect = ('barrr', 'FOO', 'secret', 'true')
self.assertTrue(all([x == y for x, y in zip(actual, expect)]))
# New-style options
# Test case with one --tenant args present: ec2 creds
shell('user-create --name=foo '
- '--pass=secrete --tenant=BARRR --enabled=true')
+ '--pass=secret --tenant=BARRR --enabled=true')
assert do_uc_mock.called
((a, b), c) = do_uc_mock.call_args
actual = (b.os_auth_url, b.os_password, b.os_tenant_id,
@@ -261,13 +261,13 @@ class ShellTest(utils.TestCase):
DEFAULT_TENANT_NAME, DEFAULT_USERNAME, '')
self.assertTrue(all([x == y for x, y in zip(actual, expect)]))
actual = (b.tenant, b.name, b.passwd, b.enabled)
- expect = ('BARRR', 'foo', 'secrete', 'true')
+ expect = ('BARRR', 'foo', 'secret', 'true')
self.assertTrue(all([x == y for x, y in zip(actual, expect)]))
# New-style options
# Test case with one --tenant-id args present: ec2 creds
shell('user-create --name=foo '
- '--pass=secrete --tenant-id=BARRR --enabled=true')
+ '--pass=secret --tenant-id=BARRR --enabled=true')
assert do_uc_mock.called
((a, b), c) = do_uc_mock.call_args
actual = (b.os_auth_url, b.os_password, b.os_tenant_id,
@@ -277,13 +277,13 @@ class ShellTest(utils.TestCase):
DEFAULT_TENANT_NAME, DEFAULT_USERNAME, '')
self.assertTrue(all([x == y for x, y in zip(actual, expect)]))
actual = (b.tenant, b.name, b.passwd, b.enabled)
- expect = ('BARRR', 'foo', 'secrete', 'true')
+ expect = ('BARRR', 'foo', 'secret', 'true')
self.assertTrue(all([x == y for x, y in zip(actual, expect)]))
# Old_style options
# Test case with --os_tenant_id and --tenant_id args present
shell('--os_tenant_id=os-tenant user-create --name=FOO '
- '--pass=secrete --tenant_id=barrr --enabled=true')
+ '--pass=secret --tenant_id=barrr --enabled=true')
assert do_uc_mock.called
((a, b), c) = do_uc_mock.call_args
actual = (b.os_auth_url, b.os_password, b.os_tenant_id,
@@ -293,13 +293,13 @@ class ShellTest(utils.TestCase):
DEFAULT_TENANT_NAME, DEFAULT_USERNAME, '')
self.assertTrue(all([x == y for x, y in zip(actual, expect)]))
actual = (b.tenant_id, b.name, b.passwd, b.enabled)
- expect = ('barrr', 'FOO', 'secrete', 'true')
+ expect = ('barrr', 'FOO', 'secret', 'true')
self.assertTrue(all([x == y for x, y in zip(actual, expect)]))
# New-style options
# Test case with --os-tenant-id and --tenant-id args present
shell('--os-tenant-id=ostenant user-create --name=foo '
- '--pass=secrete --tenant-id=BARRR --enabled=true')
+ '--pass=secret --tenant-id=BARRR --enabled=true')
assert do_uc_mock.called
((a, b), c) = do_uc_mock.call_args
actual = (b.os_auth_url, b.os_password, b.os_tenant_id,
@@ -309,7 +309,7 @@ class ShellTest(utils.TestCase):
DEFAULT_TENANT_NAME, DEFAULT_USERNAME, '')
self.assertTrue(all([x == y for x, y in zip(actual, expect)]))
actual = (b.tenant, b.name, b.passwd, b.enabled)
- expect = ('BARRR', 'foo', 'secrete', 'true')
+ expect = ('BARRR', 'foo', 'secret', 'true')
self.assertTrue(all([x == y for x, y in zip(actual, expect)]))
def test_do_tenant_create(self):