diff --git a/rhodecode/tests/functional/test_admin_notifications.py b/rhodecode/tests/functional/test_admin_notifications.py --- a/rhodecode/tests/functional/test_admin_notifications.py +++ b/rhodecode/tests/functional/test_admin_notifications.py @@ -1,9 +1,8 @@ from rhodecode.tests import * -from rhodecode.model.db import Notification, User, UserNotification +from rhodecode.model.db import Notification, User from rhodecode.model.user import UserModel from rhodecode.model.notification import NotificationModel -from rhodecode.model.meta import Session class TestNotificationsController(TestController): @@ -11,8 +10,8 @@ class TestNotificationsController(TestCo def tearDown(self): for n in Notification.query().all(): inst = Notification.get(n.notification_id) - Session.delete(inst) - Session.commit() + self.Session().delete(inst) + self.Session().commit() def test_index(self): self.log_user() @@ -31,7 +30,7 @@ class TestNotificationsController(TestCo NotificationModel().create(created_by=u1, subject=u'test_notification_1', body=u'notification_1', recipients=[cur_user]) - Session.commit() + self.Session().commit() response = self.app.get(url('notifications')) self.assertTrue(u'test_notification_1' in response.body) @@ -69,7 +68,7 @@ class TestNotificationsController(TestCo subject=u'test', body=u'hi there', recipients=[cur_user, u1, u2]) - Session.commit() + self.Session().commit() u1 = User.get(u1.user_id) u2 = User.get(u2.user_id)