From 6b319cf3d6093e3ad967f1e2f0550db3ae2e6344 Mon Sep 17 00:00:00 2001
From: Sylvain Bellemare <sylvain@ascribe.io>
Date: Fri, 16 Dec 2016 22:44:55 +0100
Subject: [PATCH] Use yield statement instead of finalizer

to specify teardown code
---
 tests/conftest.py | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/tests/conftest.py b/tests/conftest.py
index 84437d51..b71ac9fa 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -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