From aa6d4fdcc81f7eaab1bcc9126aab372706538413 Mon Sep 17 00:00:00 2001 From: Rodolphe Marques Date: Tue, 10 Jan 2017 15:31:16 +0100 Subject: [PATCH] small fix to test --- tests/backend/mongodb/test_schema.py | 17 ++++------------- tests/conftest.py | 4 ++-- 2 files changed, 6 insertions(+), 15 deletions(-) diff --git a/tests/backend/mongodb/test_schema.py b/tests/backend/mongodb/test_schema.py index 8a97ddd8..33ddb719 100644 --- a/tests/backend/mongodb/test_schema.py +++ b/tests/backend/mongodb/test_schema.py @@ -94,24 +94,15 @@ def test_create_secondary_indexes(): assert sorted(indexes) == ['_id_', 'block_and_voter'] -# The database is set up with a session scope. -# If we run this test we will remove secondary indexes that are nedeed for -# the rest of the tests -@pytest.mark.skipif(reason='This will remove the secondary indexes needed' - ' for the rest of the tests') -def test_drop(): +def test_drop(dummy_db): import bigchaindb from bigchaindb import backend from bigchaindb.backend import schema conn = backend.connect() - dbname = bigchaindb.config['database']['name'] - - # The db is set up by fixtures - assert dbname in conn.conn.database_names() - - schema.drop_database(conn, dbname) - assert dbname not in conn.conn.database_names() + assert dummy_db in conn.conn.database_names() + schema.drop_database(conn, dummy_db) + assert dummy_db not in conn.conn.database_names() def test_get_replica_set_name_not_enabled(): diff --git a/tests/conftest.py b/tests/conftest.py index 88747b03..8b7c5cb1 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -322,10 +322,10 @@ def dummy_db(request): if xdist_suffix: dbname = '{}_{}'.format(dbname, xdist_suffix) try: - schema.create_database(conn, dbname) + schema.init_database(conn, dbname) except DatabaseAlreadyExists: schema.drop_database(conn, dbname) - schema.create_database(conn, dbname) + schema.init_database(conn, dbname) yield dbname try: schema.drop_database(conn, dbname)