WIP 3

Author: StevenMaude

tests/test_scraperwiki.py

@@ -25,23 +25,16 @@ def setUp(self):
         self.clean_db()
         super().setUp()
 
-    def tearDown(self):
-        self.clean_db()
-        super().tearDown()
-
     def clean_db(self):
         if scraperwiki.sql._State._connection:
-            try:
-                scraperwiki.sql._State._connection.close()
-            except Exception:
-                pass
+            scraperwiki.sql._State._connection.close()
+        scraperwiki.sql._State._connection = None
 
         if scraperwiki.sql._State.engine:
             scraperwiki.sql._State.engine.dispose()
+        scraperwiki.sql._State.engine = None
 
-        scraperwiki.sql._State._connection = None
         scraperwiki.sql._State._transaction = None
-        scraperwiki.sql._State.engine = None
         scraperwiki.sql._State.metadata = None
         scraperwiki.sql._State.table = None
         scraperwiki.sql._State.table_pending = None