diff -r ef54ea75a642 -r b926ff4ef4a8 server/test/unittest_repository.py
--- a/server/test/unittest_repository.py	Wed Apr 22 18:28:58 2015 +0200
+++ b/server/test/unittest_repository.py	Fri Jun 06 17:08:08 2014 +0200
@@ -201,10 +201,12 @@
     def test_internal_api(self):
         repo = self.repo
         cnxid = repo.connect(self.admlogin, password=self.admpassword)
-        session = repo._get_session(cnxid, setcnxset=True)
-        self.assertEqual(repo.type_and_source_from_eid(2, session),
-                         ('CWGroup', None, 'system'))
-        self.assertEqual(repo.type_from_eid(2, session), 'CWGroup')
+        session = repo._get_session(cnxid)
+        with session.new_cnx() as cnx:
+            with cnx.ensure_cnx_set:
+                self.assertEqual(repo.type_and_source_from_eid(2, cnx),
+                                 ('CWGroup', None, 'system'))
+                self.assertEqual(repo.type_from_eid(2, cnx), 'CWGroup')
         repo.close(cnxid)
 
     def test_public_api(self):