Merge branch 'master' into 77/dev/beta_1.0/docker

tracim/migration/env.py

@@ -65,6 +65,7 @@ def run_migrations_online():
             context.run_migrations()
     finally:
         connection.close()
+        engine.dispose()
 
 if context.is_offline_mode():
     run_migrations_offline()

tracim/tracim/config/middleware.py

@@ -3,8 +3,7 @@
 
 from tracim.config.app_cfg import base_config
 from tracim.config.environment import load_environment
-from tracim.lib.daemons import DaemonsManager
-from tracim.lib.daemons import RadicaleDaemon
+from sqlalchemy.pool import NullPool
 
 __all__ = ['make_app']
 
@@ -33,6 +32,11 @@ def make_app(global_conf, full_stack=True, **app_conf):
     
    
     """
+    # Configure NullPool for SQLAlchemy id we are in tests: unknown reason
+    # don't close it's connection during test and exceed postgresql limit.
+    if global_conf.get('test') == 'true':
+        global_conf['sqlalchemy.poolclass'] = NullPool
+
     app = make_base_app(global_conf, full_stack=True, **app_conf)
     
     # Wrap your base TurboGears 2 application with custom middleware here

tracim/tracim/model/__init__.py

@@ -85,7 +85,8 @@ metadata = DeclarativeBase.metadata
 
 def init_model(engine):
     """Call me before using any of the tables or classes in the model."""
-    DBSession.configure(bind=engine)
+    if not DBSession.registry.has():  # Prevent a SQLAlchemy warning
+        DBSession.configure(bind=engine)
 
     # If you are using reflection to introspect your database and create
     # table objects for you, your tables must be defined and mapped inside

tracim/tracim/tests/__init__.py

@@ -63,7 +63,15 @@ class TestApp(BaseTestApp):
 
 def load_app(name=application_name):
     """Load the test application."""
-    return TestApp(loadapp('config:test.ini#%s' % name, relative_to=getcwd()))
+    return TestApp(
+        loadapp(
+            'config:test.ini#%s' % name,
+            relative_to=getcwd(),
+            global_conf={
+                'test': 'true',
+            },
+        )
+    )
 
 
 def setup_app(section_name=None):
@@ -156,6 +164,7 @@ def teardown_db():
             logger.debug(teardown_db, 'Exception while trying to remove sequence {}'.format(sequence.name))
 
     transaction.commit()
+    connection.close()
     engine.dispose()
 
 
@@ -249,6 +258,9 @@ class TestController(object):
         DBSession.close()
         daemons.execute_in_thread('radicale', lambda: transaction.commit())
         teardown_db()
+        transaction.commit()
+        DBSession.close_all()
+        config['tg.app_globals'].sa_engine.dispose()
 
 
 class TracimTestController(TestController):