openstack/cinder
Code Issues Proposed changes

Merge "Simplify keystone password assertions"

Browse Source
This commit is contained in:
Zuul 2018-01-25 08:38:01 +00:00 committed by Gerrit Code Review
commit aa58746ec2
1 changed files with 17 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
cinder/tests/unit/compute/test_nova.py
View File

@ -109,14 +109,11 @@ class NovaClientTestCase(test.TestCase):
p_client, p_api_version): p_client, p_api_version):
nova.novaclient(self.ctx, privileged_user=True) nova.novaclient(self.ctx, privileged_user=True)
p_password_plugin.assert_called_once_with( p_password_plugin.assert_called_once()
auth_url='http://keystonehost:5000', default_domain_id=None, self.assertEqual('adminuser',
default_domain_name=None, domain_id=None, domain_name=None, p_password_plugin.call_args[1]['username'])
password='strongpassword', project_domain_id=None, self.assertEqual('http://keystonehost:5000',
project_domain_name=None, project_id=None, project_name=None, p_password_plugin.call_args[1]['auth_url'])
trust_id=None, user_domain_id=None, user_domain_name=None,
user_id=None, username='adminuser'
)
p_client.assert_called_once_with( p_client.assert_called_once_with(
p_api_version(nova.NOVA_API_VERSION), p_api_version(nova.NOVA_API_VERSION),
session=p_session.return_value, region_name=None, session=p_session.return_value, region_name=None,
@ -137,14 +134,11 @@ class NovaClientTestCase(test.TestCase):
'http://privatekeystonehost:5000', 'http://privatekeystonehost:5000',
group='nova') group='nova')
nova.novaclient(self.ctx, privileged_user=True) nova.novaclient(self.ctx, privileged_user=True)
p_password_plugin.assert_called_once_with( p_password_plugin.assert_called_once()
auth_url='http://privatekeystonehost:5000', default_domain_id=None, self.assertEqual('http://privatekeystonehost:5000',
default_domain_name=None, domain_id=None, domain_name=None, p_password_plugin.call_args[1]['auth_url'])
password='strongpassword', project_domain_id=None, self.assertEqual('adminuser',
project_domain_name=None, project_id=None, project_name=None, p_password_plugin.call_args[1]['username'])
trust_id=None, user_domain_id=None, user_domain_name=None,
user_id=None, username='adminuser'
)
p_client.assert_called_once_with( p_client.assert_called_once_with(
p_api_version(nova.NOVA_API_VERSION), p_api_version(nova.NOVA_API_VERSION),
session=p_session.return_value, region_name=None, session=p_session.return_value, region_name=None,
@ -161,14 +155,13 @@ class NovaClientTestCase(test.TestCase):
CONF.set_override('region_name', 'farfaraway', group='nova') CONF.set_override('region_name', 'farfaraway', group='nova')
nova.novaclient(self.ctx, privileged_user=True) nova.novaclient(self.ctx, privileged_user=True)
p_password_plugin.assert_called_once_with( # This doesn't impact the password plugin, just make sure it was called
auth_url='http://keystonehost:5000', default_domain_id=None, # with expected default values
default_domain_name=None, domain_id=None, domain_name=None, p_password_plugin.assert_called_once()
password='strongpassword', project_domain_id=None, self.assertEqual('http://keystonehost:5000',
project_domain_name=None, project_id=None, project_name=None, p_password_plugin.call_args[1]['auth_url'])
trust_id=None, user_domain_id=None, user_domain_name=None, self.assertEqual('adminuser',
user_id=None, username='adminuser' p_password_plugin.call_args[1]['username'])
)
p_client.assert_called_once_with( p_client.assert_called_once_with(
p_api_version(nova.NOVA_API_VERSION), p_api_version(nova.NOVA_API_VERSION),
session=p_session.return_value, region_name='farfaraway', session=p_session.return_value, region_name='farfaraway',