diff options
Diffstat (limited to 'mediagoblin/tests')
| -rw-r--r-- | mediagoblin/tests/test_sql_migrations.py | 2 | ||||
| -rw-r--r-- | mediagoblin/tests/tools.py | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/mediagoblin/tests/test_sql_migrations.py b/mediagoblin/tests/test_sql_migrations.py index 0e7102bc..26979bdf 100644 --- a/mediagoblin/tests/test_sql_migrations.py +++ b/mediagoblin/tests/test_sql_migrations.py @@ -25,7 +25,7 @@ from sqlalchemy.ext.declarative import declarative_base from sqlalchemy.sql import select, insert from migrate import changeset -from mediagoblin.db.sql.base import GMGTableBase +from mediagoblin.db.base import GMGTableBase from mediagoblin.db.util import MigrationManager, RegisterMigration from mediagoblin.tools.common import CollectingPrinter diff --git a/mediagoblin/tests/tools.py b/mediagoblin/tests/tools.py index 0e923aee..31afb08b 100644 --- a/mediagoblin/tests/tools.py +++ b/mediagoblin/tests/tools.py @@ -28,7 +28,7 @@ from mediagoblin import mg_globals from mediagoblin.tools import testing from mediagoblin.init.config import read_mediagoblin_config from mediagoblin.db.open import setup_connection_and_db_from_config -from mediagoblin.db.sql.base import Session +from mediagoblin.db.base import Session from mediagoblin.meddleware import BaseMeddleware from mediagoblin.auth.lib import bcrypt_gen_password_hash from mediagoblin.gmg_commands.dbupdate import run_dbupdate @@ -219,7 +219,6 @@ def fixture_add_user(username=u'chris', password='toast', test_user = mg_globals.database.User.find_one({'username': username}) # ... and detach from session: - from mediagoblin.db.sql.base import Session Session.expunge(test_user) return test_user |