From 4111267480c81902277f08b0ebed79d58bbbe01d Mon Sep 17 00:00:00 2001 From: Dan Prince Date: Mon, 12 Sep 2011 16:43:29 -0400 Subject: Don't import keystone.test unless we are in testing. Fixes #lp848267. Change-Id: I90212fe072dca3f2949fd3e2d4f21ee83b0c2f3d --- keystone/backends/sqlalchemy/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keystone/backends/sqlalchemy/__init__.py b/keystone/backends/sqlalchemy/__init__.py index fe580cb3..9c8d1009 100755 --- a/keystone/backends/sqlalchemy/__init__.py +++ b/keystone/backends/sqlalchemy/__init__.py @@ -27,7 +27,6 @@ from keystone.backends.sqlalchemy import models import keystone.utils as utils import keystone.backends.api as top_api import keystone.backends.models as top_models -from keystone.test import sampledata _ENGINE = None _MAKER = None BASE = models.Base @@ -72,6 +71,7 @@ def configure_backend(options): # this is TERRIBLE coupling, but... # if we're starting up a test database, load sample fixtures if options['sql_connection'] == FOR_TESTING_ONLY: + from keystone.test import sampledata sampledata.load_fixture() -- cgit