summaryrefslogtreecommitdiff
path: root/openstackclient/tests/identity/v2_0
diff options
context:
space:
mode:
authorDean Troyer <dtroyer@gmail.com>2013-09-09 14:55:07 -0500
committerDean Troyer <dtroyer@gmail.com>2013-09-09 14:58:28 -0500
commit8898e020fb874871e4d120e686abac0a94afd392 (patch)
tree96ca294fa56a9e086299aa3281feb453eb72e4fe /openstackclient/tests/identity/v2_0
parent7a0a7d67ed639cf664f02e1148c7b4a9348f4672 (diff)
downloadpython-openstackclient-8898e020fb874871e4d120e686abac0a94afd392.tar.gz
Identity v3 tests
* Add project, user, role and service v3 tests * Fix issues in commands with enable/disable * Make commands and tests more consistent between versions * Make formatting and comments more consistent Change-Id: Id21e7a5abd7e421a7742f937861ec46b53095fc7
Diffstat (limited to 'openstackclient/tests/identity/v2_0')
-rw-r--r--openstackclient/tests/identity/v2_0/test_role.py10
1 files changed, 9 insertions, 1 deletions
diff --git a/openstackclient/tests/identity/v2_0/test_role.py b/openstackclient/tests/identity/v2_0/test_role.py
index 58de8e52..56e9d4cb 100644
--- a/openstackclient/tests/identity/v2_0/test_role.py
+++ b/openstackclient/tests/identity/v2_0/test_role.py
@@ -31,9 +31,11 @@ class TestRole(test_identity.TestIdentityv2):
# Get a shortcut to the TenantManager Mock
self.projects_mock = self.app.client_manager.identity.tenants
self.projects_mock.reset_mock()
+
# Get a shortcut to the UserManager Mock
self.users_mock = self.app.client_manager.identity.users
self.users_mock.reset_mock()
+
# Get a shortcut to the RoleManager Mock
self.roles_mock = self.app.client_manager.identity.roles
self.roles_mock.reset_mock()
@@ -49,11 +51,13 @@ class TestRoleAdd(TestRole):
copy.deepcopy(identity_fakes.PROJECT),
loaded=True,
)
+
self.users_mock.get.return_value = fakes.FakeResource(
None,
copy.deepcopy(identity_fakes.USER),
loaded=True,
)
+
self.roles_mock.get.return_value = fakes.FakeResource(
None,
copy.deepcopy(identity_fakes.ROLE),
@@ -75,9 +79,9 @@ class TestRoleAdd(TestRole):
identity_fakes.role_name,
]
verifylist = [
- ('role', identity_fakes.role_name),
('project', identity_fakes.project_name),
('user', identity_fakes.user_name),
+ ('role', identity_fakes.role_name),
]
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
@@ -217,11 +221,13 @@ class TestUserRoleList(TestRole):
copy.deepcopy(identity_fakes.PROJECT),
loaded=True,
)
+
self.users_mock.get.return_value = fakes.FakeResource(
None,
copy.deepcopy(identity_fakes.USER),
loaded=True,
)
+
self.roles_mock.roles_for_user.return_value = [
fakes.FakeResource(
None,
@@ -340,11 +346,13 @@ class TestRoleRemove(TestRole):
copy.deepcopy(identity_fakes.PROJECT),
loaded=True,
)
+
self.users_mock.get.return_value = fakes.FakeResource(
None,
copy.deepcopy(identity_fakes.USER),
loaded=True,
)
+
self.roles_mock.get.return_value = fakes.FakeResource(
None,
copy.deepcopy(identity_fakes.ROLE),