From 807b18e7b1c26bf70252464e3ac9a97d6a1c34e3 Mon Sep 17 00:00:00 2001 From: Lorenz Herzberger Date: Tue, 6 Dec 2022 10:45:36 +0100 Subject: [PATCH] fixed flush_db for new tarantool implementation Signed-off-by: Lorenz Herzberger --- tests/conftest.py | 3 +-- tests/test_core.py | 3 --- tests/utils.py | 1 + 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/tests/conftest.py b/tests/conftest.py index 1059d7b..a1bf45f 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -127,14 +127,13 @@ def _setup_database(_configure_planetmint): # TODO Here is located setup databa yield print("Deleting `{}` database".format(dbname)) - conn = Connection() schema.drop_database(conn, dbname) print("Finished deleting `{}`".format(dbname)) @pytest.fixture -def _bdb(_setup_database, _configure_planetmint): +def _bdb(_setup_database): from transactions.common.memoize import to_dict, from_dict from transactions.common.transaction import Transaction from .utils import flush_db diff --git a/tests/test_core.py b/tests/test_core.py index 1e1e9b4..9d2802b 100644 --- a/tests/test_core.py +++ b/tests/test_core.py @@ -8,8 +8,6 @@ import pytest from planetmint.version import __tm_supported_versions__ from transactions.types.assets.create import Create from transactions.types.assets.transfer import Transfer -from transactions.common.exceptions import ConfigurationError -from planetmint.backend.connection import Connection, ConnectionError @pytest.fixture @@ -52,7 +50,6 @@ def test_bigchain_class_default_initialization(config): @pytest.mark.bdb def test_get_spent_issue_1271(b, alice, bob, carol): - b.connection.close() tx_1 = Create.generate( [carol.public_key], [([carol.public_key], 8)], diff --git a/tests/utils.py b/tests/utils.py index cafd40a..6d2d02d 100644 --- a/tests/utils.py +++ b/tests/utils.py @@ -33,6 +33,7 @@ def flush_localmongo_db(connection, dbname): @flush_db.register(TarantoolDBConnection) def flush_tarantool_db(connection, dbname): connection.connect().call('drop') + connection.connect().call('init') def generate_block(planet):