diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-09-21 11:30:02 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-09-21 11:30:02 +0000 |
| commit | e6bd90e67cee1e5d3ac50340be4ba2ab757165c3 (patch) | |
| tree | 53d625435ae3699d9359e7f77a2b4e7ffafde09e | |
| parent | 8dee656df809ed1b39b2800e35cc5ef67c31e84e (diff) | |
| parent | aabf1431a3e23a734431f56df4a8d6ac446509b3 (diff) | |
| download | os-client-config-e6bd90e67cee1e5d3ac50340be4ba2ab757165c3.tar.gz | |
Merge "Test kwargs passing not just argparse"
| -rw-r--r-- | os_client_config/tests/test_config.py | 31 |
1 files changed, 29 insertions, 2 deletions
diff --git a/os_client_config/tests/test_config.py b/os_client_config/tests/test_config.py index 9c9451d..3331b33 100644 --- a/os_client_config/tests/test_config.py +++ b/os_client_config/tests/test_config.py @@ -214,7 +214,7 @@ class TestConfigArgparse(base.TestCase): def setUp(self): super(TestConfigArgparse, self).setUp() - self.options = argparse.Namespace( + self.args = dict( auth_url='http://example.com/v2', username='user', password='password', @@ -222,6 +222,7 @@ class TestConfigArgparse(base.TestCase): region_name='other-test-region', snack_type='cookie', ) + self.options = argparse.Namespace(**self.args) def test_get_one_cloud_argparse(self): c = config.OpenStackConfig(config_files=[self.cloud_yaml], @@ -236,7 +237,33 @@ class TestConfigArgparse(base.TestCase): c = config.OpenStackConfig(config_files=[self.cloud_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.assertEqual(cc.region_name, 'other-test-region') self.assertEqual(cc.snack_type, 'cookie') |