close method on connections

Author: wasade

qiita_core/util.py

@@ -80,14 +80,7 @@ def setUp(self):
             @reset_test_database
             def tearDown(self):
                 super(DecoratedClass, self).tearDown()
-                if self.conn_handler._user_conn is not None:
-                    self.conn_handler._user_conn.close()
-
-                if self.conn_handler._admin_conn is not None:
-                    self.conn_handler._admin_conn.close()
-
-                if self.conn_handler._admin_nodb_conn is not None:
-                    self.conn_handler._admin_nodb_conn.close()
+                self.conn_handler.close()
 
         return DecoratedClass
     return class_modifier

qiita_db/environment_manager.py

@@ -265,6 +265,7 @@ def drop_environment(ask_for_confirmation):
             do_drop = True
 
     if do_drop:
+        SQLConnectionHandler.close()
         admin_conn = SQLConnectionHandler(admin='admin_without_database')
         admin_conn.set_autocommit('on')
         admin_conn.execute('DROP DATABASE %s' % qiita_config.database)

qiita_db/sql_connection.py

@@ -223,6 +223,17 @@ def _open_connection(self):
         else:
             self._connection = getattr(SQLConnectionHandler, self._conn_attr)
 
+    @staticmethod
+    def close():
+        if SQLConnectionHandler._user_conn is not None:
+            SQLConnectionHandler._user_conn.close()
+
+        if SQLConnectionHandler._admin_conn is not None:
+            SQLConnectionHandler._admin_conn.close()
+
+        if SQLConnectionHandler._admin_nodb_conn is not None:
+            SQLConnectionHandler._admin_nodb_conn.close()
+
     @contextmanager
     def get_postgres_cursor(self):
         """ Returns a Postgres cursor