From d67fd8f9bff585448c410835f9ab3a825ceffed4 Mon Sep 17 00:00:00 2001 From: Brant Knudson Date: Mon, 21 Apr 2014 15:31:34 -0500 Subject: [PATCH] Fix sql_upgrade tests run by themselves The tests in test_sql_upgrade would fail to run individually, with a None dereferencing error: Traceback (most recent call last): File "keystone/tests/test_sql_upgrade.py", line 135, in setUp conn_str.startswith('sqlite') and AttributeError: 'NoneType' object has no attribute 'startswith' Change-Id: Id05ec05a344abab8d588a4761c207e2db715e750 --- keystone/tests/ksfixtures/database.py | 4 ++-- keystone/tests/test_sql_upgrade.py | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/keystone/tests/ksfixtures/database.py b/keystone/tests/ksfixtures/database.py index 23341fa7c..ae193bfb3 100644 --- a/keystone/tests/ksfixtures/database.py +++ b/keystone/tests/ksfixtures/database.py @@ -56,7 +56,7 @@ def _setup_database(extensions=None): @run_once -def _initialize_sql_session(): +def initialize_sql_session(): # Make sure the DB is located in the correct location, in this case set # the default value, as this should be able to be overridden in some # test cases. @@ -92,7 +92,7 @@ class Database(fixtures.Fixture): def __init__(self, extensions=None): super(Database, self).__init__() self._extensions = extensions - _initialize_sql_session() + initialize_sql_session() _load_sqlalchemy_models() def setUp(self): diff --git a/keystone/tests/test_sql_upgrade.py b/keystone/tests/test_sql_upgrade.py index d85893730..166bf080a 100644 --- a/keystone/tests/test_sql_upgrade.py +++ b/keystone/tests/test_sql_upgrade.py @@ -48,6 +48,7 @@ from keystone.openstack.common.db.sqlalchemy import migration from keystone.openstack.common.db.sqlalchemy import session as db_session from keystone import tests from keystone.tests import default_fixtures +from keystone.tests.ksfixtures import database CONF = config.CONF @@ -129,6 +130,7 @@ class SqlMigrateBase(tests.SQLDriverOverrides, tests.TestCase): def setUp(self): super(SqlMigrateBase, self).setUp() + database.initialize_sql_session() conn_str = CONF.database.connection if (conn_str != tests.IN_MEM_DB_CONN_STRING and conn_str.startswith('sqlite') and