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

Get config from bigchaindb not from fixture

Browse Source 
the fixture no longer returns the config, and is meant only to set the
config
This commit is contained in:
Sylvain Bellemare 2016-12-20 19:31:09 +01:00 committed by Sylvain Bellemare
parent a269375278
commit 7db02fa024
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tests/conftest.py
View File

@ -110,15 +110,15 @@ def _configure_bigchaindb(request):
# not a great way to do this
config['database']['port'] = 27017
config_utils.set_config(config)
return config
@pytest.fixture(scope='session')
def _setup_database(_configure_bigchaindb):
from bigchaindb import config
from bigchaindb.backend import connect, schema
from bigchaindb.common.exceptions import DatabaseDoesNotExist
print('Initializing test db')
db_name = _configure_bigchaindb['database']['name']
db_name = config['database']['name']
conn = connect()
try:
@ -144,9 +144,10 @@ def _setup_database(_configure_bigchaindb):
@pytest.fixture
def _bdb(_setup_database, _configure_bigchaindb):
yield
from bigchaindb import config
from bigchaindb.backend import connect
from .utils import flush_db
dbname = _configure_bigchaindb['database']['name']
dbname = config['database']['name']
conn = connect()
flush_db(conn, dbname)