summaryrefslogtreecommitdiffstats
path: root/tests/test_keystoneclient_sql.py
diff options
context:
space:
mode:
authorDolph Mathews <dolph.mathews@gmail.com>2012-11-13 06:59:21 -0600
committerDolph Mathews <dolph.mathews@gmail.com>2012-11-13 06:59:21 -0600
commit411dde190d474940c3f7b844c06d578c9e2dfbe5 (patch)
treeed9155e9005af79e37705a8cdf3704277d925e47 /tests/test_keystoneclient_sql.py
parent8dcafd81dfa0ccd958b614c12eee091a325ec5c4 (diff)
downloadkeystone-411dde190d474940c3f7b844c06d578c9e2dfbe5.tar.gz
keystone-411dde190d474940c3f7b844c06d578c9e2dfbe5.tar.xz
keystone-411dde190d474940c3f7b844c06d578c9e2dfbe5.zip
Run test_keystoneclient_sql in-memory
~35% performance improvement vs an SSD on test_keystoneclient_sql Change-Id: Ie8c9cc0c3c56f784140998a625d943be528d5089
Diffstat (limited to 'tests/test_keystoneclient_sql.py')
-rw-r--r--tests/test_keystoneclient_sql.py8
1 files changed, 3 insertions, 5 deletions
diff --git a/tests/test_keystoneclient_sql.py b/tests/test_keystoneclient_sql.py
index ce609949..8509772c 100644
--- a/tests/test_keystoneclient_sql.py
+++ b/tests/test_keystoneclient_sql.py
@@ -16,7 +16,7 @@
import uuid
-from keystone.common.sql import util as sql_util
+from keystone.common import sql
from keystone import config
from keystone import test
@@ -31,12 +31,10 @@ class KcMasterSqlTestCase(test_keystoneclient.KcMasterTestCase):
super(KcMasterSqlTestCase, self).config([
test.etcdir('keystone.conf.sample'),
test.testsdir('test_overrides.conf'),
- test.testsdir('backend_sql.conf'),
- test.testsdir('backend_sql_disk.conf')])
- sql_util.setup_test_database()
+ test.testsdir('backend_sql.conf')])
def tearDown(self):
- sql_util.teardown_test_database()
+ sql.set_global_engine(None)
super(KcMasterSqlTestCase, self).tearDown()
def test_endpoint_crud(self):