summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrant Knudson <bknudson@us.ibm.com>2013-05-21 18:59:57 -0500
committerBrant Knudson <bknudson@us.ibm.com>2013-07-22 14:09:46 -0500
commit9427db0712acd1e5274f7b653a876807110e0c73 (patch)
tree850ceda6bf99e27d1537e16ba641cb0fae9c598c
parent7fde605c5ae4709c6ab578b8080046e3f92c75c0 (diff)
downloadkeystone-9427db0712acd1e5274f7b653a876807110e0c73.tar.gz
keystone-9427db0712acd1e5274f7b653a876807110e0c73.tar.xz
keystone-9427db0712acd1e5274f7b653a876807110e0c73.zip
Ec2 credentials table not created during testing
This change makes it so that the SQL Ec2Credential unit tests can be run individually. It does this by making sure the credential table model is available before the tables are created. Before this change, you couldn't run these tests individually and would get an error that the ec2_credential table doesn't exist. Part of fix for bug 1179259 Change-Id: I68c8b91b18ac0065628c979e5bcc56152ae14916
-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())