diff options
Diffstat (limited to 'snaps/openstack/tests/conf/os_credentials_tests.py')
| -rw-r--r-- | snaps/openstack/tests/conf/os_credentials_tests.py | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/snaps/openstack/tests/conf/os_credentials_tests.py b/snaps/openstack/tests/conf/os_credentials_tests.py index 9c6fcdc..333de59 100644 --- a/snaps/openstack/tests/conf/os_credentials_tests.py +++ b/snaps/openstack/tests/conf/os_credentials_tests.py @@ -157,10 +157,10 @@ class OSCredsUnitTests(unittest.TestCase): self.assertEqual(2, os_creds.image_api_version) self.assertEqual(2, os_creds.compute_api_version) self.assertEqual(1, os_creds.heat_api_version) - self.assertIsNone(os_creds.user_domain_id) - self.assertEqual('default', os_creds.user_domain_name) - self.assertIsNone(os_creds.project_domain_id) - self.assertEqual('default', os_creds.project_domain_name) + self.assertEqual('default', os_creds.user_domain_id) + self.assertEqual('Default', os_creds.user_domain_name) + self.assertEqual('default', os_creds.project_domain_id) + self.assertEqual('Default', os_creds.project_domain_name) self.assertEqual('admin', os_creds.interface) self.assertFalse(os_creds.cacert) self.assertIsNone(os_creds.proxy_settings) @@ -178,10 +178,10 @@ class OSCredsUnitTests(unittest.TestCase): self.assertEqual(2, os_creds.image_api_version) self.assertEqual(2, os_creds.compute_api_version) self.assertEqual(1, os_creds.heat_api_version) - self.assertIsNone(os_creds.user_domain_id) - self.assertEqual('default', os_creds.user_domain_name) - self.assertIsNone(os_creds.project_domain_id) - self.assertEqual('default', os_creds.project_domain_name) + self.assertEqual('default', os_creds.user_domain_id) + self.assertEqual('Default', os_creds.user_domain_name) + self.assertEqual('default', os_creds.project_domain_id) + self.assertEqual('Default', os_creds.project_domain_name) self.assertEqual('admin', os_creds.interface) self.assertFalse(os_creds.cacert) self.assertIsNone(os_creds.proxy_settings) @@ -202,10 +202,10 @@ class OSCredsUnitTests(unittest.TestCase): self.assertEqual(6, os_creds.image_api_version) self.assertEqual(7, os_creds.compute_api_version) self.assertEqual(8.0, os_creds.heat_api_version) - self.assertIsNone(os_creds.user_domain_id) - self.assertEqual('default', os_creds.user_domain_name) - self.assertIsNone(os_creds.project_domain_id) - self.assertEqual('default', os_creds.project_domain_name) + self.assertEqual('default', os_creds.user_domain_id) + self.assertEqual('Default', os_creds.user_domain_name) + self.assertEqual('default', os_creds.project_domain_id) + self.assertEqual('Default', os_creds.project_domain_name) self.assertEqual('admin', os_creds.interface) self.assertTrue(os_creds.cacert) self.assertIsNone(os_creds.proxy_settings) @@ -226,10 +226,10 @@ class OSCredsUnitTests(unittest.TestCase): self.assertEqual(6, os_creds.image_api_version) self.assertEqual(7, os_creds.compute_api_version) self.assertEqual(8.0, os_creds.heat_api_version) - self.assertIsNone(os_creds.user_domain_id) - self.assertEqual('default', os_creds.user_domain_name) - self.assertIsNone(os_creds.project_domain_id) - self.assertEqual('default', os_creds.project_domain_name) + self.assertEqual('default', os_creds.user_domain_id) + self.assertEqual('Default', os_creds.user_domain_name) + self.assertEqual('default', os_creds.project_domain_id) + self.assertEqual('Default', os_creds.project_domain_name) self.assertEqual('admin', os_creds.interface) self.assertTrue(os_creds.cacert) self.assertIsNone(os_creds.proxy_settings) @@ -248,10 +248,10 @@ class OSCredsUnitTests(unittest.TestCase): self.assertEqual(2, os_creds.image_api_version) self.assertEqual(2, os_creds.compute_api_version) self.assertEqual(1, os_creds.heat_api_version) - self.assertIsNone(os_creds.user_domain_id) - self.assertEqual('default', os_creds.user_domain_name) - self.assertIsNone(os_creds.project_domain_id) - self.assertEqual('default', os_creds.project_domain_name) + self.assertEqual('default', os_creds.user_domain_id) + self.assertEqual('Default', os_creds.user_domain_name) + self.assertEqual('default', os_creds.project_domain_id) + self.assertEqual('Default', os_creds.project_domain_name) self.assertEqual('admin', os_creds.interface) self.assertFalse(os_creds.cacert) self.assertEqual('foo', os_creds.proxy_settings.host) @@ -325,10 +325,10 @@ class OSCredsUnitTests(unittest.TestCase): self.assertEqual(2, os_creds.image_api_version) self.assertEqual(2, os_creds.compute_api_version) self.assertEqual(1, os_creds.heat_api_version) - self.assertIsNone(os_creds.user_domain_id) - self.assertEqual('default', os_creds.user_domain_name) - self.assertIsNone(os_creds.project_domain_id) - self.assertEqual('default', os_creds.project_domain_name) + self.assertEqual('default', os_creds.user_domain_id) + self.assertEqual('Default', os_creds.user_domain_name) + self.assertEqual('default', os_creds.project_domain_id) + self.assertEqual('Default', os_creds.project_domain_name) self.assertEqual('admin', os_creds.interface) self.assertFalse(os_creds.cacert) self.assertEqual('foo', os_creds.proxy_settings.host) |