x/deb-os-client-config
Code Issues Proposed changes

Merge "Test kwargs passing not just argparse"

Browse Source
This commit is contained in:
Jenkins 2015-09-21 11:30:02 +00:00 committed by Gerrit Code Review
commit e6bd90e67c
1 changed files with 29 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
os_client_config/tests/test_config.py
View File

@ -214,7 +214,7 @@ class TestConfigArgparse(base.TestCase):
def setUp(self): def setUp(self):
super(TestConfigArgparse, self).setUp() super(TestConfigArgparse, self).setUp()
self.options = argparse.Namespace( self.args = dict(
auth_url='http://example.com/v2', auth_url='http://example.com/v2',
username='user', username='user',
password='password', password='password',
@ -222,6 +222,7 @@ class TestConfigArgparse(base.TestCase):
region_name='other-test-region', region_name='other-test-region',
snack_type='cookie', snack_type='cookie',
) )
self.options = argparse.Namespace(**self.args)
def test_get_one_cloud_argparse(self): def test_get_one_cloud_argparse(self):
c = config.OpenStackConfig(config_files=[self.cloud_yaml], c = config.OpenStackConfig(config_files=[self.cloud_yaml],
@ -236,7 +237,33 @@ class TestConfigArgparse(base.TestCase):
c = config.OpenStackConfig(config_files=[self.cloud_yaml], c = config.OpenStackConfig(config_files=[self.cloud_yaml],
vendor_files=[self.vendor_yaml]) vendor_files=[self.vendor_yaml])
cc = c.get_one_cloud(cloud='', argparse=self.options) cc = c.get_one_cloud(argparse=self.options)
self.assertIsNone(cc.cloud)
self.assertEqual(cc.region_name, 'other-test-region')
self.assertEqual(cc.snack_type, 'cookie')
def test_get_one_cloud_just_kwargs(self):
c = config.OpenStackConfig(config_files=[self.cloud_yaml],
vendor_files=[self.vendor_yaml])
cc = c.get_one_cloud(**self.args)
self.assertIsNone(cc.cloud)
self.assertEqual(cc.region_name, 'other-test-region')
self.assertEqual(cc.snack_type, 'cookie')
def test_get_one_cloud_dash_kwargs(self):
c = config.OpenStackConfig(config_files=[self.cloud_yaml],
vendor_files=[self.vendor_yaml])
args = {
'auth-url': 'http://example.com/v2',
'username': 'user',
'password': 'password',
'project_name': 'project',
'region_name': 'other-test-region',
'snack_type': 'cookie',
}
cc = c.get_one_cloud(**args)
self.assertIsNone(cc.cloud) self.assertIsNone(cc.cloud)
self.assertEqual(cc.region_name, 'other-test-region') self.assertEqual(cc.region_name, 'other-test-region')
self.assertEqual(cc.snack_type, 'cookie') self.assertEqual(cc.snack_type, 'cookie')