diff rhodecode/tests/functional/test_admin_notifications.py @ 3797:d7488551578e beta

synced vcs with upstream - moved subprocessio module to VCS - many small changes to make embedded vcs as similar to to external lib - use only absolute imports - patch vcs config during load pylons env
author Marcin Kuzminski <marcin@python-works.com>
date Sat, 27 Apr 2013 11:24:25 +0200
parents 63e49418a4cc
children ffd45b185016
line wrap: on
line diff
--- a/rhodecode/tests/functional/test_admin_notifications.py	Sat Apr 27 11:45:27 2013 +0200
+++ b/rhodecode/tests/functional/test_admin_notifications.py	Sat Apr 27 11:24:25 2013 +0200
@@ -3,6 +3,7 @@
 
 from rhodecode.model.user import UserModel
 from rhodecode.model.notification import NotificationModel
+from rhodecode.model.meta import Session
 
 
 class TestNotificationsController(TestController):
@@ -10,8 +11,8 @@
     def tearDown(self):
         for n in Notification.query().all():
             inst = Notification.get(n.notification_id)
-            self.Session().delete(inst)
-        self.Session().commit()
+            Session().delete(inst)
+        Session().commit()
 
     def test_index(self):
         self.log_user()
@@ -29,7 +30,7 @@
         NotificationModel().create(created_by=u1, subject=u'test_notification_1',
                                    body=u'notification_1',
                                    recipients=[cur_user])
-        self.Session().commit()
+        Session().commit()
         response = self.app.get(url('notifications'))
         response.mustcontain(u'test_notification_1')
 
@@ -67,7 +68,7 @@
                                                   subject=u'test',
                                                   body=u'hi there',
                                                   recipients=[cur_user, u1, u2])
-        self.Session().commit()
+        Session().commit()
         u1 = User.get(u1.user_id)
         u2 = User.get(u2.user_id)