diff options
| author | Dan Prince <dan.prince@rackspace.com> | 2011-09-12 16:43:29 -0400 |
|---|---|---|
| committer | Dan Prince <dan.prince@rackspace.com> | 2011-09-12 16:43:29 -0400 |
| commit | 4111267480c81902277f08b0ebed79d58bbbe01d (patch) | |
| tree | f47901cdb0effbdb8e1f91581345fbcbbc4ca868 | |
| parent | 95f49529a1999802e208f6d4c292395462e4b7be (diff) | |
Don't import keystone.test unless we are in testing. Fixes #lp848267.
Change-Id: I90212fe072dca3f2949fd3e2d4f21ee83b0c2f3d
| -rwxr-xr-x | keystone/backends/sqlalchemy/__init__.py | 2 |
1 files changed, 1 insertions, 1 deletions
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() |