diff --git a/pytest_reana/fixtures.py b/pytest_reana/fixtures.py index e6b9929..2f6830e 100644 --- a/pytest_reana/fixtures.py +++ b/pytest_reana/fixtures.py @@ -64,12 +64,9 @@ def db_engine(base_app): including a ``SQLALCHEMY_DATABASE_URI`` configuration variable. When finished it will delete the database. """ - test_db_engine = create_engine( - base_app.config['SQLALCHEMY_DATABASE_URI']) - if not database_exists(test_db_engine.url): - create_database(test_db_engine.url) - yield test_db_engine - drop_database(test_db_engine.url) + from reana_db.database import engine + yield engine + drop_database(engine.url) @pytest.fixture() @@ -90,18 +87,13 @@ def test_create_workflow(session): session.add(workflow) session.commit() """ - Session = scoped_session(sessionmaker(autocommit=False, - autoflush=False, - bind=db_engine)) - Base.query = Session.query_property() - from reana_db.database import Session as _Session - _Session.configure(bind=db_engine) + from reana_db.database import Session yield Session Session.close() @pytest.fixture() -def app(base_app, db_engine, session): +def app(base_app, db_engine): """Flask application fixture. Scope: function @@ -122,11 +114,8 @@ def create_ninja_turtle() """ with base_app.app_context(): - import reana_db.models Base.metadata.create_all(bind=db_engine) yield base_app - for table in reversed(Base.metadata.sorted_tables): - db_engine.execute(table.delete()) @pytest.fixture() diff --git a/pytest_reana/version.py b/pytest_reana/version.py index ec7e5cf..ef7dd3c 100755 --- a/pytest_reana/version.py +++ b/pytest_reana/version.py @@ -14,4 +14,4 @@ from __future__ import absolute_import, print_function -__version__ = "0.7.0.dev20200427" +__version__ = "0.7.0.dev20200430"