diff --git a/tests/conftest.py b/tests/conftest.py index 5c1d2a0..f4a097f 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -123,12 +123,12 @@ def _configure_planetmint(request): @pytest.fixture(scope='session') def _setup_database(_configure_planetmint): # TODO Here is located setup database - from planetmint.backend.connection import Connection + from planetmint.backend.connection import connect from planetmint.config import Config print('Initializing test db') dbname = Config().get()['database']['name'] - conn = Connection() + conn = connect() _drop_db(conn, dbname) schema.init_database(conn) @@ -137,7 +137,7 @@ def _setup_database(_configure_planetmint): # TODO Here is located setup databa yield print('Deleting `{}` database'.format(dbname)) - conn = Connection() + conn = connect() _drop_db(conn, dbname) print('Finished deleting `{}`'.format(dbname)) @@ -145,7 +145,6 @@ def _setup_database(_configure_planetmint): # TODO Here is located setup databa @pytest.fixture def _bdb(_setup_database, _configure_planetmint): - print(f"BDB CALL") from planetmint.backend import Connection from planetmint.transactions.common.memoize import to_dict, from_dict from planetmint.models import Transaction @@ -363,6 +362,7 @@ def inputs(user_pk, b, alice): def _drop_db(conn, dbname): + print(f"CONNECTION FOR DROPPING {conn}") try: schema.drop_database(conn, dbname) except DatabaseDoesNotExist: diff --git a/tests/utils.py b/tests/utils.py index 786b02d..ac4d40c 100644 --- a/tests/utils.py +++ b/tests/utils.py @@ -10,7 +10,7 @@ import random from functools import singledispatch from planetmint.backend.localmongodb.connection import LocalMongoDBConnection -from planetmint.backend.tarantool.connection import TarantoolDB +from planetmint.backend.tarantool.connection import TarantoolDBConnection from planetmint.backend.schema import TABLES, SPACE_NAMES from planetmint.transactions.common import crypto from planetmint.transactions.common.transaction_mode_types import BROADCAST_TX_COMMIT @@ -30,7 +30,7 @@ def flush_localmongo_db(connection, dbname): getattr(connection.conn[dbname], t).delete_many({}) -@flush_db.register(TarantoolDB) +@flush_db.register(TarantoolDBConnection) def flush_tarantool_db(connection, dbname): for s in SPACE_NAMES: _space = connection.space(space_name=s)