Browse Source

Tests: auto close session

Bastien Sevajol 9 years ago
parent
commit
f21aac6503

+ 2 - 1
tracim/tracim/tests/__init__.py View File

29
 from who_ldap import make_connection
29
 from who_ldap import make_connection
30
 
30
 
31
 from tracim.lib.base import logger
31
 from tracim.lib.base import logger
32
+from tracim.model import DBSession
32
 
33
 
33
 __all__ = ['setup_app', 'setup_db', 'teardown_db', 'TestController']
34
 __all__ = ['setup_app', 'setup_db', 'teardown_db', 'TestController']
34
 
35
 
193
 
194
 
194
     def tearDown(self):
195
     def tearDown(self):
195
         """Tear down test fixture for each functional test method."""
196
         """Tear down test fixture for each functional test method."""
196
-        # model.DBSession.remove()
197
+        DBSession.close()
197
         teardown_db()
198
         teardown_db()
198
 
199
 
199
 
200
 

+ 0 - 2
tracim/tracim/tests/functional/test_ldap_authentication.py View File

21
 
21
 
22
         # User is registered in tracim database
22
         # User is registered in tracim database
23
         eq_(0, DBSession.query(User).filter(User.email == 'unknown-user@fsf.org').count())
23
         eq_(0, DBSession.query(User).filter(User.email == 'unknown-user@fsf.org').count())
24
-        DBSession.close()
25
 
24
 
26
     def test_ldap_auth_sync(self):
25
     def test_ldap_auth_sync(self):
27
         # User is unknown in tracim database
26
         # User is unknown in tracim database
31
 
30
 
32
         # User is registered in tracim database
31
         # User is registered in tracim database
33
         eq_(1, DBSession.query(User).filter(User.email == 'richard-not-real-email@fsf.org').count())
32
         eq_(1, DBSession.query(User).filter(User.email == 'richard-not-real-email@fsf.org').count())
34
-        DBSession.close()