summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2013-07-31 08:15:18 +0000
committerGerrit Code Review <review@openstack.org>2013-07-31 08:15:18 +0000
commitd0d9d97ad166d9c57ab0ee494600c50a704a781b (patch)
tree454baaf92adbec3577431008234b1f39cb7f13c7
parent59586915ed031adfdaa8b3fb4abcfe4b9a9eb0a0 (diff)
parent9427db0712acd1e5274f7b653a876807110e0c73 (diff)
downloadkeystone-d0d9d97ad166d9c57ab0ee494600c50a704a781b.tar.gz
keystone-d0d9d97ad166d9c57ab0ee494600c50a704a781b.tar.xz
keystone-d0d9d97ad166d9c57ab0ee494600c50a704a781b.zip
Merge "Ec2 credentials table not created during testing"
-rw-r--r--keystone/test.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/keystone/test.py b/keystone/test.py
index 0c51d76d..2c2be577 100644
--- a/keystone/test.py
+++ b/keystone/test.py
@@ -44,6 +44,7 @@ from keystone.common import sql
from keystone.common import utils
from keystone.common import wsgi
from keystone import config
+from keystone.contrib import ec2
from keystone import credential
from keystone import exception
from keystone import identity
@@ -252,7 +253,7 @@ class TestCase(NoModule, unittest.TestCase):
def load_backends(self):
"""Initializes each manager and assigns them to an attribute."""
- for manager in [assignment, catalog, credential, identity, policy,
+ for manager in [assignment, catalog, credential, ec2, identity, policy,
token, trust]:
manager_name = '%s_api' % manager.__name__.split('.')[-1]
setattr(self, manager_name, manager.Manager())