Mirroristas/bigchaindb
2
0
Fork 0
mirror of https://github.com/bigchaindb/bigchaindb.git synced 2024-10-13 13:34:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use yield statement instead of finalizer

Browse Source 
to specify teardown code
This commit is contained in:
Sylvain Bellemare 2016-12-16 22:44:55 +01:00 committed by Sylvain Bellemare
parent b4063dd9ad
commit 6b319cf3d6
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
tests/conftest.py
View File

@ -145,7 +145,7 @@ def structurally_valid_vote():
@pytest.fixture
def setup_database(request, restore_config, node_config):
def setup_database(restore_config, node_config):
from bigchaindb.backend import connect, schema
from bigchaindb.common.exceptions import DatabaseDoesNotExist
print('Initializing test db')
@ -158,20 +158,18 @@ def setup_database(request, restore_config, node_config):
pass
schema.init_database(conn)
print('Finishing init database')
def fin():
conn = connect()
print('Deleting `{}` database'.format(db_name))
try:
schema.drop_database(conn, db_name)
except DatabaseDoesNotExist:
pass
yield
print('Finished deleting `{}`'.format(db_name))
print('Deleting `{}` database'.format(db_name))
conn = connect()
try:
schema.drop_database(conn, db_name)
except DatabaseDoesNotExist:
pass
request.addfinalizer(fin)
print('Finished deleting `{}`'.format(db_name))
@pytest.fixture