From 8e88c12722f98ea6fe4e39c1c20551972a7f8765 Mon Sep 17 00:00:00 2001 From: andrei Date: Thu, 26 May 2022 14:59:59 +0300 Subject: [PATCH] _setup_database fixture restored.(STILL NOT WORKING in this commit) --- tests/conftest.py | 37 +++++++++++++++++++++++++++---------- 1 file changed, 27 insertions(+), 10 deletions(-) diff --git a/tests/conftest.py b/tests/conftest.py index 7e02cf7..9062447 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -123,20 +123,37 @@ def _configure_planetmint(request): @pytest.fixture(scope='session') def _setup_database(_configure_planetmint): # TODO Here is located setup database - from planetmint.backend.tarantool.connection import TarantoolDB + from planetmint.backend.connection import Connection + from planetmint.config import Config - print('Deleting `{}` database') - db_conn = Connection() - db_conn.drop_database() - db_conn.init_database() - print('Finished deleting ``') + # print('Deleting `{}` database') + # db_conn = Connection() + # db_conn.drop_database() + # db_conn.init_database() + # print('Finished deleting ``') + # + # yield + # + # print('Initializing test db') + # db_conn2 = Connection() + # db_conn2.drop_database() + # print('Finishing init database') + + print('Initializing test db') + dbname = Config().get()['database']['name'] + conn = Connection() + + _drop_db(conn, dbname) + schema.init_database(conn) + print('Finishing init database') yield - print('Initializing test db') - db_conn2 = Connection() - db_conn2.drop_database() - print('Finishing init database') + print('Deleting `{}` database'.format(dbname)) + conn = Connection() + _drop_db(conn, dbname) + + print('Finished deleting `{}`'.format(dbname)) @pytest.fixture