Removed print + removed import of interface directly

This commit is contained in:
andrei 2022-05-30 15:36:12 +03:00
parent dad02b1ebc
commit ccb2df1477
2 changed files with 6 additions and 6 deletions

View File

@ -123,12 +123,12 @@ def _configure_planetmint(request):
@pytest.fixture(scope='session') @pytest.fixture(scope='session')
def _setup_database(_configure_planetmint): # TODO Here is located setup database 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 from planetmint.config import Config
print('Initializing test db') print('Initializing test db')
dbname = Config().get()['database']['name'] dbname = Config().get()['database']['name']
conn = Connection() conn = connect()
_drop_db(conn, dbname) _drop_db(conn, dbname)
schema.init_database(conn) schema.init_database(conn)
@ -137,7 +137,7 @@ def _setup_database(_configure_planetmint): # TODO Here is located setup databa
yield yield
print('Deleting `{}` database'.format(dbname)) print('Deleting `{}` database'.format(dbname))
conn = Connection() conn = connect()
_drop_db(conn, dbname) _drop_db(conn, dbname)
print('Finished deleting `{}`'.format(dbname)) print('Finished deleting `{}`'.format(dbname))
@ -145,7 +145,6 @@ def _setup_database(_configure_planetmint): # TODO Here is located setup databa
@pytest.fixture @pytest.fixture
def _bdb(_setup_database, _configure_planetmint): def _bdb(_setup_database, _configure_planetmint):
print(f"BDB CALL")
from planetmint.backend import Connection from planetmint.backend import Connection
from planetmint.transactions.common.memoize import to_dict, from_dict from planetmint.transactions.common.memoize import to_dict, from_dict
from planetmint.models import Transaction from planetmint.models import Transaction
@ -363,6 +362,7 @@ def inputs(user_pk, b, alice):
def _drop_db(conn, dbname): def _drop_db(conn, dbname):
print(f"CONNECTION FOR DROPPING {conn}")
try: try:
schema.drop_database(conn, dbname) schema.drop_database(conn, dbname)
except DatabaseDoesNotExist: except DatabaseDoesNotExist:

View File

@ -10,7 +10,7 @@ import random
from functools import singledispatch from functools import singledispatch
from planetmint.backend.localmongodb.connection import LocalMongoDBConnection 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.backend.schema import TABLES, SPACE_NAMES
from planetmint.transactions.common import crypto from planetmint.transactions.common import crypto
from planetmint.transactions.common.transaction_mode_types import BROADCAST_TX_COMMIT 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({}) getattr(connection.conn[dbname], t).delete_many({})
@flush_db.register(TarantoolDB) @flush_db.register(TarantoolDBConnection)
def flush_tarantool_db(connection, dbname): def flush_tarantool_db(connection, dbname):
for s in SPACE_NAMES: for s in SPACE_NAMES:
_space = connection.space(space_name=s) _space = connection.space(space_name=s)