summaryrefslogtreecommitdiff
path: root/heat/tests/test_common_context.py
diff options
context:
space:
mode:
authorPeter Razumovsky <prazumovsky@mirantis.com>2015-09-24 18:15:11 +0300
committerPeter Razumovsky <prazumovsky@mirantis.com>2015-10-12 14:08:16 +0300
commitc4b0ced813ba355c7e54cdacb4c347a44379ef16 (patch)
treea4d3662832bbee6686dceeafd6f7594a3a449f0b /heat/tests/test_common_context.py
parent34f32eef0e54bc7f19a9083a6f673e501da9255a (diff)
downloadheat-c4b0ced813ba355c7e54cdacb4c347a44379ef16.tar.gz
Fix [H405] pep rule in heat/tests
Implements bp docstring-improvements Change-Id: I2fd82d698f42aca3b34822875cf4d706fedbf5f2
Diffstat (limited to 'heat/tests/test_common_context.py')
-rw-r--r--heat/tests/test_common_context.py16
1 files changed, 10 insertions, 6 deletions
diff --git a/heat/tests/test_common_context.py b/heat/tests/test_common_context.py
index 5de3515b8..a883b3e90 100644
--- a/heat/tests/test_common_context.py
+++ b/heat/tests/test_common_context.py
@@ -114,9 +114,7 @@ class TestRequestContext(common.HeatTestCase):
self.assertFalse(ctx.is_admin)
def test_keystone_v3_endpoint_in_context(self):
- """Ensure that the context is the preferred source for the
- auth_uri.
- """
+ """Ensure that the context is the preferred source for the auth_uri."""
cfg.CONF.set_override('auth_uri', 'http://xyz',
group='clients_keystone')
policy_check = 'heat.common.policy.Enforcer.check_is_admin'
@@ -128,7 +126,9 @@ class TestRequestContext(common.HeatTestCase):
'http://example.com:5000/v3')
def test_keystone_v3_endpoint_in_clients_keystone_config(self):
- """Ensure that the [clients_keystone] section of the configuration is
+ """Ensure that the [clients_keystone] section is the preferred source.
+
+ Ensure that the [clients_keystone] section of the configuration is
the preferred source when the context does not have the auth_uri.
"""
cfg.CONF.set_override('auth_uri', 'http://xyz',
@@ -149,7 +149,9 @@ class TestRequestContext(common.HeatTestCase):
self.assertEqual(ctx.keystone_v3_endpoint, 'http://xyz/v3')
def test_keystone_v3_endpoint_in_keystone_authtoken_config(self):
- """Ensure that the [keystone_authtoken] section of the configuration
+ """Ensure that the [keystone_authtoken] section is used.
+
+ Ensure that the [keystone_authtoken] section of the configuration
is used when the auth_uri is not defined in the context or the
[clients_keystone] section.
"""
@@ -163,7 +165,9 @@ class TestRequestContext(common.HeatTestCase):
self.assertEqual(ctx.keystone_v3_endpoint, 'http://abc/v3')
def test_keystone_v3_endpoint_not_set_in_config(self):
- """Ensure an exception is raised when the auth_uri cannot be obtained
+ """Ensure an exception is raised when the auth_uri cannot be obtained.
+
+ Ensure an exception is raised when the auth_uri cannot be obtained
from any source.
"""
policy_check = 'heat.common.policy.Enforcer.check_is_admin'