diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-10-02 11:13:49 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-10-02 11:13:49 +0000 |
| commit | b6b1e30d3b8d8d89ddb6d26b201a2f767ef83663 (patch) | |
| tree | 2ef97528046f8449b77c9df7b338f0d16a034033 | |
| parent | 3ed9c32267a80d03debfc97cee82115566ddffe0 (diff) | |
| parent | ca3a073922ef86128337314cacf14d235acbaa31 (diff) | |
| download | keystone-2013.2.rc1.tar.gz | |
Merge "Imports oslo policy to fix test issues"2013.2.rc1
| -rw-r--r-- | keystone/tests/core.py | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/keystone/tests/core.py b/keystone/tests/core.py index 5c051a48a..8cbbcb3e9 100644 --- a/keystone/tests/core.py +++ b/keystone/tests/core.py @@ -67,6 +67,11 @@ from keystone import token from keystone.token import provider as token_provider from keystone import trust +# NOTE(dstanek): Tests inheriting from TestCase depend on having the +# policy_file command-line option declared before setUp runs. Importing the +# oslo policy module automatically declares the option. +from keystone.openstack.common import policy as common_policy # noqa + LOG = logging.getLogger(__name__) ROOTDIR = os.path.dirname(os.path.abspath('..')) |