diff --git a/openstackclient/tests/fakes.py b/openstackclient/tests/fakes.py
index e0122022a8..22292a646f 100644
--- a/openstackclient/tests/fakes.py
+++ b/openstackclient/tests/fakes.py
@@ -37,6 +37,7 @@ class FakeApp(object):
self.stdin = sys.stdin
self.stdout = _stdout or sys.stdout
self.stderr = sys.stderr
+ self.restapi = None
class FakeClientManager(object):
@@ -44,11 +45,6 @@ class FakeClientManager(object):
pass
-class FakeRESTApi(object):
- def __init__(self):
- pass
-
-
class FakeResource(object):
def __init__(self, manager, info, loaded=False):
self.manager = manager
diff --git a/openstackclient/tests/identity/fakes.py b/openstackclient/tests/identity/fakes.py
index b1e385e291..1c1ea72bc3 100644
--- a/openstackclient/tests/identity/fakes.py
+++ b/openstackclient/tests/identity/fakes.py
@@ -18,6 +18,38 @@ import mock
from openstackclient.tests import fakes
+user_id = 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa'
+user_name = 'paul'
+user_description = 'Sir Paul'
+user_email = 'paul@applecorps.com'
+
+project_id = '8-9-64'
+project_name = 'beatles'
+project_description = 'Fab Four'
+
+USER = {
+ 'id': user_id,
+ 'name': user_name,
+ 'tenantId': project_id,
+ 'email': user_email,
+ 'enabled': True,
+}
+
+PROJECT = {
+ 'id': project_id,
+ 'name': project_name,
+ 'description': project_description,
+ 'enabled': True,
+}
+
+PROJECT_2 = {
+ 'id': project_id + '-2222',
+ 'name': project_name + ' reprise',
+ 'description': project_description + 'plus four more',
+ 'enabled': True,
+}
+
+
class FakeIdentityv2Client(object):
def __init__(self, **kwargs):
self.tenants = mock.Mock()
@@ -26,8 +58,8 @@ class FakeIdentityv2Client(object):
self.users.resource_class = fakes.FakeResource(None, {})
self.ec2 = mock.Mock()
self.ec2.resource_class = fakes.FakeResource(None, {})
- self.auth_tenant_id = 'fake-tenant'
- self.auth_user_id = 'fake-user'
+ self.auth_token = kwargs['token']
+ self.management_url = kwargs['endpoint']
class FakeIdentityv3Client(object):
diff --git a/openstackclient/tests/identity/test_identity.py b/openstackclient/tests/identity/test_identity.py
index 04bbd20f49..894f47baa2 100644
--- a/openstackclient/tests/identity/test_identity.py
+++ b/openstackclient/tests/identity/test_identity.py
@@ -22,27 +22,29 @@ AUTH_TOKEN = "foobar"
AUTH_URL = "http://0.0.0.0"
-class FakeClient(object):
- def __init__(self, endpoint=None, **kwargs):
- self.auth_token = AUTH_TOKEN
- self.auth_url = AUTH_URL
-
-
-class TestIdentity(utils.TestCase):
+class TestIdentity(utils.TestCommand):
def setUp(self):
super(TestIdentity, self).setUp()
api_version = {"identity": "2.0"}
identity_client.API_VERSIONS = {
- "2.0": "openstackclient.tests.identity.test_identity.FakeClient"
+ "2.0": "openstackclient.tests.identity.fakes.FakeIdentityv2Client"
}
- self.cm = clientmanager.ClientManager(token=AUTH_TOKEN,
- url=AUTH_URL,
- auth_url=AUTH_URL,
- api_version=api_version)
+ self.app.client_manager = clientmanager.ClientManager(
+ token=AUTH_TOKEN,
+ url=AUTH_URL,
+ auth_url=AUTH_URL,
+ api_version=api_version,
+ )
def test_make_client(self):
- self.assertEqual(self.cm.identity.auth_token, AUTH_TOKEN)
- self.assertEqual(self.cm.identity.auth_url, AUTH_URL)
+ self.assertEqual(
+ self.app.client_manager.identity.auth_token,
+ AUTH_TOKEN,
+ )
+ self.assertEqual(
+ self.app.client_manager.identity.management_url,
+ AUTH_URL,
+ )
diff --git a/openstackclient/tests/identity/v2_0/test_projects.py b/openstackclient/tests/identity/v2_0/test_project.py
similarity index 58%
rename from openstackclient/tests/identity/v2_0/test_projects.py
rename to openstackclient/tests/identity/v2_0/test_project.py
index c937028f1a..c6c9b8ee01 100644
--- a/openstackclient/tests/identity/v2_0/test_projects.py
+++ b/openstackclient/tests/identity/v2_0/test_project.py
@@ -18,42 +18,17 @@ import copy
from openstackclient.identity.v2_0 import project
from openstackclient.tests import fakes
from openstackclient.tests.identity import fakes as identity_fakes
-from openstackclient.tests import utils
+from openstackclient.tests.identity import test_identity
-IDENTITY_API_VERSION = "2.0"
-
-user_id = 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa'
-user_name = 'paul'
-user_description = 'Sir Paul'
-
-project_id = '8-9-64'
-project_name = 'beatles'
-project_description = 'Fab Four'
-
-USER = {
- 'id': user_id,
- 'name': user_name,
- 'tenantId': project_id,
-}
-
-PROJECT = {
- 'id': project_id,
- 'name': project_name,
- 'description': project_description,
- 'enabled': True,
-}
-
-
-class TestProject(utils.TestCommand):
+class TestProject(test_identity.TestIdentity):
def setUp(self):
super(TestProject, self).setUp()
- self.app.client_manager.identity = \
- identity_fakes.FakeIdentityv2Client()
# Get a shortcut to the TenantManager Mock
self.projects_mock = self.app.client_manager.identity.tenants
+ self.projects_mock.reset_mock()
class TestProjectCreate(TestProject):
@@ -63,7 +38,7 @@ class TestProjectCreate(TestProject):
self.projects_mock.create.return_value = fakes.FakeResource(
None,
- copy.deepcopy(PROJECT),
+ copy.deepcopy(identity_fakes.PROJECT),
loaded=True,
)
@@ -71,9 +46,11 @@ class TestProjectCreate(TestProject):
self.cmd = project.CreateProject(self.app, None)
def test_project_create_no_options(self):
- arglist = [project_name]
+ arglist = [
+ identity_fakes.project_name,
+ ]
verifylist = [
- ('project_name', project_name),
+ ('project_name', identity_fakes.project_name),
('enable', False),
('disable', False),
]
@@ -87,16 +64,30 @@ class TestProjectCreate(TestProject):
'description': None,
'enabled': True,
}
- self.projects_mock.create.assert_called_with(project_name, **kwargs)
+ self.projects_mock.create.assert_called_with(
+ identity_fakes.project_name,
+ **kwargs
+ )
collist = ('description', 'enabled', 'id', 'name')
self.assertEqual(columns, collist)
- datalist = (project_description, True, project_id, project_name)
+ datalist = (
+ identity_fakes.project_description,
+ True,
+ identity_fakes.project_id,
+ identity_fakes.project_name,
+ )
self.assertEqual(data, datalist)
def test_project_create_description(self):
- arglist = ['--description', 'new desc', project_name]
- verifylist = [('description', 'new desc')]
+ arglist = [
+ '--description', 'new desc',
+ identity_fakes.project_name,
+ ]
+ verifylist = [
+ ('project_name', identity_fakes.project_name),
+ ('description', 'new desc'),
+ ]
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
# DisplayCommandBase.take_action() returns two tuples
@@ -107,16 +98,31 @@ class TestProjectCreate(TestProject):
'description': 'new desc',
'enabled': True,
}
- self.projects_mock.create.assert_called_with(project_name, **kwargs)
+ self.projects_mock.create.assert_called_with(
+ identity_fakes.project_name,
+ **kwargs
+ )
collist = ('description', 'enabled', 'id', 'name')
self.assertEqual(columns, collist)
- datalist = (project_description, True, project_id, project_name)
+ datalist = (
+ identity_fakes.project_description,
+ True,
+ identity_fakes.project_id,
+ identity_fakes.project_name,
+ )
self.assertEqual(data, datalist)
def test_project_create_enable(self):
- arglist = ['--enable', project_name]
- verifylist = [('enable', True), ('disable', False)]
+ arglist = [
+ '--enable',
+ identity_fakes.project_name,
+ ]
+ verifylist = [
+ ('project_name', identity_fakes.project_name),
+ ('enable', True),
+ ('disable', False),
+ ]
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
# DisplayCommandBase.take_action() returns two tuples
@@ -127,16 +133,31 @@ class TestProjectCreate(TestProject):
'description': None,
'enabled': True,
}
- self.projects_mock.create.assert_called_with(project_name, **kwargs)
+ self.projects_mock.create.assert_called_with(
+ identity_fakes.project_name,
+ **kwargs
+ )
collist = ('description', 'enabled', 'id', 'name')
self.assertEqual(columns, collist)
- datalist = (project_description, True, project_id, project_name)
+ datalist = (
+ identity_fakes.project_description,
+ True,
+ identity_fakes.project_id,
+ identity_fakes.project_name,
+ )
self.assertEqual(data, datalist)
def test_project_create_disable(self):
- arglist = ['--disable', project_name]
- verifylist = [('enable', False), ('disable', True)]
+ arglist = [
+ '--disable',
+ identity_fakes.project_name,
+ ]
+ verifylist = [
+ ('project_name', identity_fakes.project_name),
+ ('enable', False),
+ ('disable', True),
+ ]
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
# DisplayCommandBase.take_action() returns two tuples
@@ -147,11 +168,19 @@ class TestProjectCreate(TestProject):
'description': None,
'enabled': False,
}
- self.projects_mock.create.assert_called_with(project_name, **kwargs)
+ self.projects_mock.create.assert_called_with(
+ identity_fakes.project_name,
+ **kwargs
+ )
collist = ('description', 'enabled', 'id', 'name')
self.assertEqual(columns, collist)
- datalist = (project_description, True, project_id, project_name)
+ datalist = (
+ identity_fakes.project_description,
+ True,
+ identity_fakes.project_id,
+ identity_fakes.project_name,
+ )
self.assertEqual(data, datalist)
@@ -163,7 +192,7 @@ class TestProjectDelete(TestProject):
# This is the return value for utils.find_resource()
self.projects_mock.get.return_value = fakes.FakeResource(
None,
- copy.deepcopy(PROJECT),
+ copy.deepcopy(identity_fakes.PROJECT),
loaded=True,
)
self.projects_mock.delete.return_value = None
@@ -172,14 +201,20 @@ class TestProjectDelete(TestProject):
self.cmd = project.DeleteProject(self.app, None)
def test_project_delete_no_options(self):
- arglist = [user_id]
- verifylist = [('project', user_id)]
+ arglist = [
+ identity_fakes.project_id,
+ ]
+ verifylist = [
+ ('project', identity_fakes.project_id),
+ ]
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
result = self.cmd.run(parsed_args)
self.assertEqual(result, 0)
- self.projects_mock.delete.assert_called_with(project_id)
+ self.projects_mock.delete.assert_called_with(
+ identity_fakes.project_id,
+ )
class TestProjectList(TestProject):
@@ -190,7 +225,7 @@ class TestProjectList(TestProject):
self.projects_mock.list.return_value = [
fakes.FakeResource(
None,
- copy.deepcopy(PROJECT),
+ copy.deepcopy(identity_fakes.PROJECT),
loaded=True,
),
]
@@ -209,12 +244,19 @@ class TestProjectList(TestProject):
collist = ('ID', 'Name')
self.assertEqual(columns, collist)
- datalist = ((project_id, project_name), )
+ datalist = ((
+ identity_fakes.project_id,
+ identity_fakes.project_name,
+ ), )
self.assertEqual(tuple(data), datalist)
def test_project_list_long(self):
- arglist = ['--long']
- verifylist = [('long', True)]
+ arglist = [
+ '--long',
+ ]
+ verifylist = [
+ ('long', True),
+ ]
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
# DisplayCommandBase.take_action() returns two tuples
@@ -223,7 +265,12 @@ class TestProjectList(TestProject):
collist = ('ID', 'Name', 'Description', 'Enabled')
self.assertEqual(columns, collist)
- datalist = ((project_id, project_name, project_description, True), )
+ datalist = ((
+ identity_fakes.project_id,
+ identity_fakes.project_name,
+ identity_fakes.project_description,
+ True,
+ ), )
self.assertEqual(tuple(data), datalist)
@@ -234,7 +281,7 @@ class TestProjectSet(TestProject):
self.projects_mock.get.return_value = fakes.FakeResource(
None,
- copy.deepcopy(PROJECT),
+ copy.deepcopy(identity_fakes.PROJECT),
loaded=True,
)
@@ -242,9 +289,11 @@ class TestProjectSet(TestProject):
self.cmd = project.SetProject(self.app, None)
def test_project_set_no_options(self):
- arglist = [project_name]
+ arglist = [
+ identity_fakes.project_name,
+ ]
verifylist = [
- ('project', project_name),
+ ('project', identity_fakes.project_name),
('enable', False),
('disable', False),
]
@@ -255,15 +304,23 @@ class TestProjectSet(TestProject):
# Set expected values
kwargs = {
- 'description': project_description,
+ 'description': identity_fakes.project_description,
'enabled': True,
- 'tenant_name': project_name,
+ 'tenant_name': identity_fakes.project_name,
}
- self.projects_mock.update.assert_called_with(project_id, **kwargs)
+ self.projects_mock.update.assert_called_with(
+ identity_fakes.project_id,
+ **kwargs
+ )
def test_project_set_name(self):
- arglist = ['--name', 'qwerty', project_name]
- verifylist = [('name', 'qwerty')]
+ arglist = [
+ '--name', 'qwerty',
+ identity_fakes.project_name,
+ ]
+ verifylist = [
+ ('name', 'qwerty'),
+ ]
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
result = self.cmd.run(parsed_args)
@@ -271,15 +328,23 @@ class TestProjectSet(TestProject):
# Set expected values
kwargs = {
- 'description': project_description,
+ 'description': identity_fakes.project_description,
'enabled': True,
'tenant_name': 'qwerty',
}
- self.projects_mock.update.assert_called_with(project_id, **kwargs)
+ self.projects_mock.update.assert_called_with(
+ identity_fakes.project_id,
+ **kwargs
+ )
def test_project_set_description(self):
- arglist = ['--description', 'new desc', project_name]
- verifylist = [('description', 'new desc')]
+ arglist = [
+ '--description', 'new desc',
+ identity_fakes.project_name,
+ ]
+ verifylist = [
+ ('description', 'new desc'),
+ ]
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
result = self.cmd.run(parsed_args)
@@ -289,13 +354,22 @@ class TestProjectSet(TestProject):
kwargs = {
'description': 'new desc',
'enabled': True,
- 'tenant_name': project_name,
+ 'tenant_name': identity_fakes.project_name,
}
- self.projects_mock.update.assert_called_with(project_id, **kwargs)
+ self.projects_mock.update.assert_called_with(
+ identity_fakes.project_id,
+ **kwargs
+ )
def test_project_set_enable(self):
- arglist = ['--enable', project_name]
- verifylist = [('enable', True), ('disable', False)]
+ arglist = [
+ '--enable',
+ identity_fakes.project_name,
+ ]
+ verifylist = [
+ ('enable', True),
+ ('disable', False),
+ ]
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
result = self.cmd.run(parsed_args)
@@ -303,15 +377,24 @@ class TestProjectSet(TestProject):
# Set expected values
kwargs = {
- 'description': project_description,
+ 'description': identity_fakes.project_description,
'enabled': True,
- 'tenant_name': project_name,
+ 'tenant_name': identity_fakes.project_name,
}
- self.projects_mock.update.assert_called_with(project_id, **kwargs)
+ self.projects_mock.update.assert_called_with(
+ identity_fakes.project_id,
+ **kwargs
+ )
def test_project_set_disable(self):
- arglist = ['--disable', project_name]
- verifylist = [('enable', False), ('disable', True)]
+ arglist = [
+ '--disable',
+ identity_fakes.project_name,
+ ]
+ verifylist = [
+ ('enable', False),
+ ('disable', True),
+ ]
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
result = self.cmd.run(parsed_args)
@@ -319,11 +402,14 @@ class TestProjectSet(TestProject):
# Set expected values
kwargs = {
- 'description': project_description,
+ 'description': identity_fakes.project_description,
'enabled': False,
- 'tenant_name': project_name,
+ 'tenant_name': identity_fakes.project_name,
}
- self.projects_mock.update.assert_called_with(project_id, **kwargs)
+ self.projects_mock.update.assert_called_with(
+ identity_fakes.project_id,
+ **kwargs
+ )
class TestProjectShow(TestProject):
@@ -333,7 +419,7 @@ class TestProjectShow(TestProject):
self.projects_mock.get.return_value = fakes.FakeResource(
None,
- copy.deepcopy(PROJECT),
+ copy.deepcopy(identity_fakes.PROJECT),
loaded=True,
)
@@ -341,15 +427,26 @@ class TestProjectShow(TestProject):
self.cmd = project.ShowProject(self.app, None)
def test_project_show(self):
- arglist = [user_id]
- verifylist = [('project', user_id)]
+ arglist = [
+ identity_fakes.project_id,
+ ]
+ verifylist = [
+ ('project', identity_fakes.project_id),
+ ]
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
# DisplayCommandBase.take_action() returns two tuples
columns, data = self.cmd.take_action(parsed_args)
- self.projects_mock.get.assert_called_with(user_id)
+ self.projects_mock.get.assert_called_with(
+ identity_fakes.project_id,
+ )
collist = ('description', 'enabled', 'id', 'name')
self.assertEqual(columns, collist)
- datalist = (project_description, True, project_id, project_name)
+ datalist = (
+ identity_fakes.project_description,
+ True,
+ identity_fakes.project_id,
+ identity_fakes.project_name,
+ )
self.assertEqual(data, datalist)
diff --git a/openstackclient/tests/identity/v2_0/test_users.py b/openstackclient/tests/identity/v2_0/test_user.py
similarity index 62%
rename from openstackclient/tests/identity/v2_0/test_users.py
rename to openstackclient/tests/identity/v2_0/test_user.py
index 49a5262b56..529173da5d 100644
--- a/openstackclient/tests/identity/v2_0/test_users.py
+++ b/openstackclient/tests/identity/v2_0/test_user.py
@@ -18,54 +18,20 @@ import copy
from openstackclient.identity.v2_0 import user
from openstackclient.tests import fakes
from openstackclient.tests.identity import fakes as identity_fakes
-from openstackclient.tests import utils
+from openstackclient.tests.identity import test_identity
-IDENTITY_API_VERSION = "2.0"
-
-user_id = 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa'
-user_name = 'paul'
-user_description = 'Sir Paul'
-user_email = 'paul@applecorps.com'
-
-project_id = '8-9-64'
-project_name = 'beatles'
-project_description = 'Fab Four'
-
-USER = {
- 'id': user_id,
- 'name': user_name,
- 'tenantId': project_id,
- 'email': user_email,
- 'enabled': True,
-}
-
-PROJECT = {
- 'id': project_id,
- 'name': project_name,
- 'description': project_description,
- 'enabled': True,
-}
-
-PROJECT_2 = {
- 'id': project_id + '-2222',
- 'name': project_name + ' reprise',
- 'description': project_description + 'plus four more',
- 'enabled': True,
-}
-
-
-class TestUser(utils.TestCommand):
+class TestUser(test_identity.TestIdentity):
def setUp(self):
super(TestUser, self).setUp()
- self.app.client_manager.identity = \
- identity_fakes.FakeIdentityv2Client()
# 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()
class TestUserCreate(TestUser):
@@ -75,12 +41,12 @@ class TestUserCreate(TestUser):
self.projects_mock.get.return_value = fakes.FakeResource(
None,
- copy.deepcopy(PROJECT),
+ copy.deepcopy(identity_fakes.PROJECT),
loaded=True,
)
self.users_mock.create.return_value = fakes.FakeResource(
None,
- copy.deepcopy(USER),
+ copy.deepcopy(identity_fakes.USER),
loaded=True,
)
@@ -88,9 +54,11 @@ class TestUserCreate(TestUser):
self.cmd = user.CreateUser(self.app, None)
def test_user_create_no_options(self):
- arglist = [user_name]
+ arglist = [
+ identity_fakes.user_name,
+ ]
verifylist = [
- ('name', user_name),
+ ('name', identity_fakes.user_name),
]
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
@@ -104,7 +72,7 @@ class TestUserCreate(TestUser):
}
# users.create(name, password, email, tenant_id=None, enabled=True)
self.users_mock.create.assert_called_with(
- user_name,
+ identity_fakes.user_name,
None,
None,
**kwargs
@@ -112,12 +80,24 @@ class TestUserCreate(TestUser):
collist = ('email', 'enabled', 'id', 'name', 'project_id')
self.assertEqual(columns, collist)
- datalist = (user_email, True, user_id, user_name, project_id)
+ datalist = (
+ identity_fakes.user_email,
+ True,
+ identity_fakes.user_id,
+ identity_fakes.user_name,
+ identity_fakes.project_id,
+ )
self.assertEqual(data, datalist)
def test_user_create_password(self):
- arglist = ['--password', 'secret', user_name]
- verifylist = [('password', 'secret')]
+ arglist = [
+ '--password', 'secret',
+ identity_fakes.user_name,
+ ]
+ verifylist = [
+ ('name', identity_fakes.user_name),
+ ('password', 'secret')
+ ]
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
# DisplayCommandBase.take_action() returns two tuples
@@ -130,7 +110,7 @@ class TestUserCreate(TestUser):
}
# users.create(name, password, email, tenant_id=None, enabled=True)
self.users_mock.create.assert_called_with(
- user_name,
+ identity_fakes.user_name,
'secret',
None,
**kwargs
@@ -138,12 +118,24 @@ class TestUserCreate(TestUser):
collist = ('email', 'enabled', 'id', 'name', 'project_id')
self.assertEqual(columns, collist)
- datalist = (user_email, True, user_id, user_name, project_id)
+ datalist = (
+ identity_fakes.user_email,
+ True,
+ identity_fakes.user_id,
+ identity_fakes.user_name,
+ identity_fakes.project_id,
+ )
self.assertEqual(data, datalist)
def test_user_create_email(self):
- arglist = ['--email', 'barney@example.com', user_name]
- verifylist = [('email', 'barney@example.com')]
+ arglist = [
+ '--email', 'barney@example.com',
+ identity_fakes.user_name,
+ ]
+ verifylist = [
+ ('name', identity_fakes.user_name),
+ ('email', 'barney@example.com'),
+ ]
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
# DisplayCommandBase.take_action() returns two tuples
@@ -156,7 +148,7 @@ class TestUserCreate(TestUser):
}
# users.create(name, password, email, tenant_id=None, enabled=True)
self.users_mock.create.assert_called_with(
- user_name,
+ identity_fakes.user_name,
None,
'barney@example.com',
**kwargs
@@ -164,27 +156,39 @@ class TestUserCreate(TestUser):
collist = ('email', 'enabled', 'id', 'name', 'project_id')
self.assertEqual(columns, collist)
- datalist = (user_email, True, user_id, user_name, project_id)
+ datalist = (
+ identity_fakes.user_email,
+ True,
+ identity_fakes.user_id,
+ identity_fakes.user_name,
+ identity_fakes.project_id,
+ )
self.assertEqual(data, datalist)
def test_user_create_project(self):
# Return the new project
self.projects_mock.get.return_value = fakes.FakeResource(
None,
- copy.deepcopy(PROJECT_2),
+ copy.deepcopy(identity_fakes.PROJECT_2),
loaded=True,
)
# Set up to return an updated user
- USER_2 = copy.deepcopy(USER)
- USER_2['tenantId'] = PROJECT_2['id']
+ USER_2 = copy.deepcopy(identity_fakes.USER)
+ USER_2['tenantId'] = identity_fakes.PROJECT_2['id']
self.users_mock.create.return_value = fakes.FakeResource(
None,
USER_2,
loaded=True,
)
- arglist = ['--project', PROJECT_2['name'], user_name]
- verifylist = [('project', PROJECT_2['name'])]
+ arglist = [
+ '--project', identity_fakes.PROJECT_2['name'],
+ identity_fakes.user_name,
+ ]
+ verifylist = [
+ ('name', identity_fakes.user_name),
+ ('project', identity_fakes.PROJECT_2['name']),
+ ]
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
# DisplayCommandBase.take_action() returns two tuples
@@ -193,11 +197,11 @@ class TestUserCreate(TestUser):
# Set expected values
kwargs = {
'enabled': True,
- 'tenant_id': PROJECT_2['id'],
+ 'tenant_id': identity_fakes.PROJECT_2['id'],
}
# users.create(name, password, email, tenant_id=None, enabled=True)
self.users_mock.create.assert_called_with(
- user_name,
+ identity_fakes.user_name,
None,
None,
**kwargs
@@ -205,12 +209,25 @@ class TestUserCreate(TestUser):
collist = ('email', 'enabled', 'id', 'name', 'project_id')
self.assertEqual(columns, collist)
- datalist = (user_email, True, user_id, user_name, PROJECT_2['id'])
+ datalist = (
+ identity_fakes.user_email,
+ True,
+ identity_fakes.user_id,
+ identity_fakes.user_name,
+ identity_fakes.PROJECT_2['id'],
+ )
self.assertEqual(data, datalist)
def test_user_create_enable(self):
- arglist = ['--enable', project_name]
- verifylist = [('enable', True), ('disable', False)]
+ arglist = [
+ '--enable',
+ identity_fakes.user_name,
+ ]
+ verifylist = [
+ ('name', identity_fakes.user_name),
+ ('enable', True),
+ ('disable', False),
+ ]
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
# DisplayCommandBase.take_action() returns two tuples
@@ -223,7 +240,7 @@ class TestUserCreate(TestUser):
}
# users.create(name, password, email, tenant_id=None, enabled=True)
self.users_mock.create.assert_called_with(
- project_name,
+ identity_fakes.user_name,
None,
None,
**kwargs
@@ -231,12 +248,25 @@ class TestUserCreate(TestUser):
collist = ('email', 'enabled', 'id', 'name', 'project_id')
self.assertEqual(columns, collist)
- datalist = (user_email, True, user_id, user_name, project_id)
+ datalist = (
+ identity_fakes.user_email,
+ True,
+ identity_fakes.user_id,
+ identity_fakes.user_name,
+ identity_fakes.project_id,
+ )
self.assertEqual(data, datalist)
def test_user_create_disable(self):
- arglist = ['--disable', project_name]
- verifylist = [('enable', False), ('disable', True)]
+ arglist = [
+ '--disable',
+ identity_fakes.user_name,
+ ]
+ verifylist = [
+ ('name', identity_fakes.user_name),
+ ('enable', False),
+ ('disable', True),
+ ]
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
# DisplayCommandBase.take_action() returns two tuples
@@ -249,7 +279,7 @@ class TestUserCreate(TestUser):
}
# users.create(name, password, email, tenant_id=None, enabled=True)
self.users_mock.create.assert_called_with(
- project_name,
+ identity_fakes.user_name,
None,
None,
**kwargs
@@ -257,7 +287,13 @@ class TestUserCreate(TestUser):
collist = ('email', 'enabled', 'id', 'name', 'project_id')
self.assertEqual(columns, collist)
- datalist = (user_email, True, user_id, user_name, project_id)
+ datalist = (
+ identity_fakes.user_email,
+ True,
+ identity_fakes.user_id,
+ identity_fakes.user_name,
+ identity_fakes.project_id,
+ )
self.assertEqual(data, datalist)
@@ -269,7 +305,7 @@ class TestUserDelete(TestUser):
# This is the return value for utils.find_resource()
self.users_mock.get.return_value = fakes.FakeResource(
None,
- copy.deepcopy(USER),
+ copy.deepcopy(identity_fakes.USER),
loaded=True,
)
self.users_mock.delete.return_value = None
@@ -278,16 +314,20 @@ class TestUserDelete(TestUser):
self.cmd = user.DeleteUser(self.app, None)
def test_user_delete_no_options(self):
- arglist = [user_id]
+ arglist = [
+ identity_fakes.user_id,
+ ]
verifylist = [
- ('user', user_id),
+ ('user', identity_fakes.user_id),
]
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
# DisplayCommandBase.take_action() returns two tuples
self.cmd.take_action(parsed_args)
- self.users_mock.delete.assert_called_with(user_id)
+ self.users_mock.delete.assert_called_with(
+ identity_fakes.user_id,
+ )
class TestUserList(TestUser):
@@ -295,10 +335,17 @@ class TestUserList(TestUser):
def setUp(self):
super(TestUserList, self).setUp()
+ self.projects_mock.list.return_value = [
+ fakes.FakeResource(
+ None,
+ copy.deepcopy(identity_fakes.PROJECT),
+ loaded=True,
+ ),
+ ]
self.users_mock.list.return_value = [
fakes.FakeResource(
None,
- copy.deepcopy(USER),
+ copy.deepcopy(identity_fakes.USER),
loaded=True,
),
]
@@ -318,12 +365,19 @@ class TestUserList(TestUser):
collist = ('ID', 'Name')
self.assertEqual(columns, collist)
- datalist = ((user_id, user_name), )
+ datalist = ((
+ identity_fakes.user_id,
+ identity_fakes.user_name,
+ ), )
self.assertEqual(tuple(data), datalist)
def test_user_list_project(self):
- arglist = ['--project', project_id]
- verifylist = [('project', project_id)]
+ arglist = [
+ '--project', identity_fakes.project_id,
+ ]
+ verifylist = [
+ ('project', identity_fakes.project_id),
+ ]
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
# DisplayCommandBase.take_action() returns two tuples
@@ -333,12 +387,19 @@ class TestUserList(TestUser):
collist = ('ID', 'Name')
self.assertEqual(columns, collist)
- datalist = ((user_id, user_name), )
+ datalist = ((
+ identity_fakes.user_id,
+ identity_fakes.user_name,
+ ), )
self.assertEqual(tuple(data), datalist)
def test_user_list_long(self):
- arglist = ['--long']
- verifylist = [('long', True)]
+ arglist = [
+ '--long',
+ ]
+ verifylist = [
+ ('long', True),
+ ]
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
# DisplayCommandBase.take_action() returns two tuples
@@ -348,7 +409,13 @@ class TestUserList(TestUser):
collist = ('ID', 'Name', 'Project', 'Email', 'Enabled')
self.assertEqual(columns, collist)
- datalist = ((user_id, user_name, project_id, user_email, True), )
+ datalist = ((
+ identity_fakes.user_id,
+ identity_fakes.user_name,
+ identity_fakes.project_name,
+ identity_fakes.user_email,
+ True,
+ ), )
self.assertEqual(tuple(data), datalist)
@@ -359,12 +426,12 @@ class TestUserSet(TestUser):
self.projects_mock.get.return_value = fakes.FakeResource(
None,
- copy.deepcopy(PROJECT),
+ copy.deepcopy(identity_fakes.PROJECT),
loaded=True,
)
self.users_mock.get.return_value = fakes.FakeResource(
None,
- copy.deepcopy(USER),
+ copy.deepcopy(identity_fakes.USER),
loaded=True,
)
@@ -372,9 +439,11 @@ class TestUserSet(TestUser):
self.cmd = user.SetUser(self.app, None)
def test_user_set_no_options(self):
- arglist = [user_name]
+ arglist = [
+ identity_fakes.user_name,
+ ]
verifylist = [
- ('user', user_name),
+ ('user', identity_fakes.user_name),
('enable', False),
('disable', False),
('project', None),
@@ -384,11 +453,17 @@ class TestUserSet(TestUser):
# DisplayCommandBase.take_action() returns two tuples
self.cmd.take_action(parsed_args)
+ # SetUser doesn't call anything if no args are passed
self.assertFalse(self.users_mock.update.called)
def test_user_set_name(self):
- arglist = ['--name', 'qwerty', user_name]
- verifylist = [('name', 'qwerty')]
+ arglist = [
+ '--name', 'qwerty',
+ identity_fakes.user_name,
+ ]
+ verifylist = [
+ ('name', 'qwerty'),
+ ]
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
# DisplayCommandBase.take_action() returns two tuples
@@ -398,21 +473,37 @@ class TestUserSet(TestUser):
kwargs = {
'name': 'qwerty',
}
- self.users_mock.update.assert_called_with(user_id, **kwargs)
+ self.users_mock.update.assert_called_with(
+ identity_fakes.user_id,
+ **kwargs
+ )
def test_user_set_password(self):
- arglist = ['--password', 'secret', user_name]
- verifylist = [('password', 'secret')]
+ arglist = [
+ '--password', 'secret',
+ identity_fakes.user_name,
+ ]
+ verifylist = [
+ ('password', 'secret'),
+ ]
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
# DisplayCommandBase.take_action() returns two tuples
self.cmd.take_action(parsed_args)
- self.users_mock.update_password.assert_called_with(user_id, 'secret')
+ self.users_mock.update_password.assert_called_with(
+ identity_fakes.user_id,
+ 'secret',
+ )
def test_user_set_email(self):
- arglist = ['--email', 'barney@example.com', user_name]
- verifylist = [('email', 'barney@example.com')]
+ arglist = [
+ '--email', 'barney@example.com',
+ identity_fakes.user_name,
+ ]
+ verifylist = [
+ ('email', 'barney@example.com'),
+ ]
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
# DisplayCommandBase.take_action() returns two tuples
@@ -422,24 +513,38 @@ class TestUserSet(TestUser):
kwargs = {
'email': 'barney@example.com',
}
- self.users_mock.update.assert_called_with(user_id, **kwargs)
+ self.users_mock.update.assert_called_with(
+ identity_fakes.user_id,
+ **kwargs
+ )
def test_user_set_project(self):
- arglist = ['--project', project_id, user_name]
- verifylist = [('project', project_id)]
+ arglist = [
+ '--project', identity_fakes.project_id,
+ identity_fakes.user_name,
+ ]
+ verifylist = [
+ ('project', identity_fakes.project_id),
+ ]
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
# DisplayCommandBase.take_action() returns two tuples
self.cmd.take_action(parsed_args)
self.users_mock.update_tenant.assert_called_with(
- user_id,
- project_id,
+ identity_fakes.user_id,
+ identity_fakes.project_id,
)
def test_user_set_enable(self):
- arglist = ['--enable', user_name]
- verifylist = [('enable', True), ('disable', False)]
+ arglist = [
+ '--enable',
+ identity_fakes.user_name,
+ ]
+ verifylist = [
+ ('enable', True),
+ ('disable', False),
+ ]
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
# DisplayCommandBase.take_action() returns two tuples
@@ -449,11 +554,20 @@ class TestUserSet(TestUser):
kwargs = {
'enabled': True,
}
- self.users_mock.update.assert_called_with(user_id, **kwargs)
+ self.users_mock.update.assert_called_with(
+ identity_fakes.user_id,
+ **kwargs
+ )
def test_user_set_disable(self):
- arglist = ['--disable', user_name]
- verifylist = [('enable', False), ('disable', True)]
+ arglist = [
+ '--disable',
+ identity_fakes.user_name,
+ ]
+ verifylist = [
+ ('enable', False),
+ ('disable', True),
+ ]
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
# DisplayCommandBase.take_action() returns two tuples
@@ -463,7 +577,10 @@ class TestUserSet(TestUser):
kwargs = {
'enabled': False,
}
- self.users_mock.update.assert_called_with(user_id, **kwargs)
+ self.users_mock.update.assert_called_with(
+ identity_fakes.user_id,
+ **kwargs
+ )
class TestUserShow(TestUser):
@@ -473,7 +590,7 @@ class TestUserShow(TestUser):
self.users_mock.get.return_value = fakes.FakeResource(
None,
- copy.deepcopy(USER),
+ copy.deepcopy(identity_fakes.USER),
loaded=True,
)
@@ -481,16 +598,26 @@ class TestUserShow(TestUser):
self.cmd = user.ShowUser(self.app, None)
def test_user_show(self):
- arglist = [user_id]
- verifylist = [('user', user_id)]
+ arglist = [
+ identity_fakes.user_id,
+ ]
+ verifylist = [
+ ('user', identity_fakes.user_id),
+ ]
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
# DisplayCommandBase.take_action() returns two tuples
columns, data = self.cmd.take_action(parsed_args)
- self.users_mock.get.assert_called_with(user_id)
+ self.users_mock.get.assert_called_with(identity_fakes.user_id)
collist = ('email', 'enabled', 'id', 'name', 'project_id')
self.assertEqual(columns, collist)
- datalist = (user_email, True, user_id, user_name, project_id)
+ datalist = (
+ identity_fakes.user_email,
+ True,
+ identity_fakes.user_id,
+ identity_fakes.user_name,
+ identity_fakes.project_id,
+ )
self.assertEqual(data, datalist)
diff --git a/openstackclient/tests/object/v1/lib/test_container.py b/openstackclient/tests/object/v1/lib/test_container.py
index a241cc021f..1c0112c884 100644
--- a/openstackclient/tests/object/v1/lib/test_container.py
+++ b/openstackclient/tests/object/v1/lib/test_container.py
@@ -22,6 +22,7 @@ import mock
from openstackclient.object.v1.lib import container as lib_container
from openstackclient.tests.common import test_restapi as restapi
+from openstackclient.tests import fakes
from openstackclient.tests import utils
@@ -41,6 +42,7 @@ class TestObject(utils.TestCommand):
def setUp(self):
super(TestObject, self).setUp()
+ self.app.client_manager = fakes.FakeClientManager()
self.app.client_manager.object = FakeClient()
self.app.restapi = mock.MagicMock()
diff --git a/openstackclient/tests/object/v1/lib/test_object.py b/openstackclient/tests/object/v1/lib/test_object.py
index ef8ae18dc5..b4793cc24a 100644
--- a/openstackclient/tests/object/v1/lib/test_object.py
+++ b/openstackclient/tests/object/v1/lib/test_object.py
@@ -21,6 +21,7 @@ import mock
from openstackclient.object.v1.lib import object as lib_object
from openstackclient.tests.common import test_restapi as restapi
+from openstackclient.tests import fakes
from openstackclient.tests import utils
@@ -40,6 +41,7 @@ class TestObject(utils.TestCommand):
def setUp(self):
super(TestObject, self).setUp()
+ self.app.client_manager = fakes.FakeClientManager()
self.app.client_manager.object = FakeClient()
self.app.restapi = mock.MagicMock()
diff --git a/openstackclient/tests/utils.py b/openstackclient/tests/utils.py
index 4516318908..cf7fda6d56 100644
--- a/openstackclient/tests/utils.py
+++ b/openstackclient/tests/utils.py
@@ -70,8 +70,6 @@ class TestCommand(TestCase):
# Build up a fake app
self.fake_stdout = fakes.FakeStdout()
self.app = fakes.FakeApp(self.fake_stdout)
- self.app.client_manager = fakes.FakeClientManager()
- self.app.restapi = fakes.FakeRESTApi()
def check_parser(self, cmd, args, verify_args):
cmd_parser = cmd.get_parser('check_parser')