kallithea Changeset - 37d713674f63

Changeset - 37d713674f63

Parent rev.

Child rev.

[Not reviewed]

default

0 5 0

Thomas De Schampheleire - 10 years ago 2016-02-09 17:51:09
thomas.de.schampheleire@gmail.com

tests: move remove_all_notifications outside of BaseTestCase

In preparation of allowing real pytest-style test cases (instead of
unittest-style ones), some reorganization is needed in the base test
classes, for one because we want a transition period where pytest and
unittest style test cases can live alongside each other, and secondly
because the pytest style test classes cannot have an __init__ method.

The BaseTestCase class will not be reused for the pytest test cases, but
the remove_all_notifications method will. To avoid having to duplicate it,
and since it does not use any resources from the class (self), move the
method out of the BaseTestCase class to top-level, and export it in
kallithea.tests.

5 files changed with 13 insertions and 12 deletions:

kallithea/tests/__init__.py

kallithea/tests/functional/test_admin_notifications.py

kallithea/tests/functional/test_changeset_comments.py

kallithea/tests/functional/test_login.py

kallithea/tests/models/test_notifications.py

0 comments (0 inline, 0 general)

kallithea/tests/__init__.py

➞

Show inline comments

@@ @@ -66,13 +66,13 @@ __all__ = [ @@
     'HG_FORK', 'GIT_FORK', 'TEST_USER_ADMIN_LOGIN', 'TEST_USER_ADMIN_PASS',
     'TEST_USER_ADMIN_EMAIL', 'TEST_USER_REGULAR_LOGIN', 'TEST_USER_REGULAR_PASS',
     'TEST_USER_REGULAR_EMAIL', 'TEST_USER_REGULAR2_LOGIN',
     'TEST_USER_REGULAR2_PASS', 'TEST_USER_REGULAR2_EMAIL', 'TEST_HG_REPO',
     'TEST_HG_REPO_CLONE', 'TEST_HG_REPO_PULL', 'TEST_GIT_REPO',
     'TEST_GIT_REPO_CLONE', 'TEST_GIT_REPO_PULL', 'HG_REMOTE_REPO',
     'GIT_REMOTE_REPO', 'SCM_TESTS',
+    'GIT_REMOTE_REPO', 'SCM_TESTS', 'remove_all_notifications',
+]
 # Invoke websetup with the current config file
 # SetupCommand('setup-app').run([config_file])
 environ = {}
@@ @@ -157,27 +157,28 @@ def init_stack(config=None): @@
     # Initialize a translator for tests that utilize i18n
     translator = _get_translator(pylons.config.get('lang'))
     pylons.translator._push_object(translator)
     h = NullHandler()
     logging.getLogger("kallithea").addHandler(h)
 def remove_all_notifications():
     Notification.query().delete()
     # Because query().delete() does not (by default) trigger cascades.
     # http://docs.sqlalchemy.org/en/rel_0_7/orm/collections.html#passive-deletes
     UserNotification.query().delete()
     Session().commit()
 class BaseTestCase(unittest.TestCase):
     def __init__(self, *args, **kwargs):
         self.wsgiapp = pylons.test.pylonsapp
         init_stack(self.wsgiapp.config)
         unittest.TestCase.__init__(self, *args, **kwargs)
     def remove_all_notifications(self):
         Notification.query().delete()
         # Because query().delete() does not (by default) trigger cascades.
         # http://docs.sqlalchemy.org/en/rel_0_7/orm/collections.html#passive-deletes
         UserNotification.query().delete()
         Session().commit()
 class TestController(BaseTestCase):
     def __init__(self, *args, **kwargs):
         BaseTestCase.__init__(self, *args, **kwargs)

kallithea/tests/functional/test_admin_notifications.py

➞

Show inline comments

@@ @@ -6,13 +6,13 @@ from kallithea.model.notification import @@
 from kallithea.model.meta import Session
 from kallithea.lib import helpers as h
 class TestNotificationsController(TestController):
     def setUp(self):
-        self.remove_all_notifications()
         remove_all_notifications()
     def test_index(self):
         self.log_user()
         u1 = UserModel().create_or_update(username='u1', password='qweqwe',
                                           email='u1@example.com',

kallithea/tests/functional/test_changeset_comments.py

➞

Show inline comments

@@ @@ -8,13 +8,13 @@ class TestChangeSetCommentsController(Te @@
     def setUp(self):
         for x in ChangesetComment.query().all():
             Session().delete(x)
         Session().commit()
-        self.remove_all_notifications()
         remove_all_notifications()
     def test_create(self):
         self.log_user()
         rev = '27cd5cce30c96924232dffcd24178a07ffeb5dfc'
         text = u'CommentOnRevision'

kallithea/tests/functional/test_login.py

➞

Show inline comments

@@ @@ -18,13 +18,13 @@ from kallithea.model.user import UserMod @@
 fixture = Fixture()
 class TestLoginController(TestController):
     def setUp(self):
-        self.remove_all_notifications()
         remove_all_notifications()
         self.assertEqual(Notification.query().all(), [])
     def test_index(self):
         response = self.app.get(url(controller='login', action='index'))
         self.assertEqual(response.status, '200 OK')
         # Test response...

kallithea/tests/models/test_notifications.py

➞

Show inline comments

@@ @@ -32,13 +32,13 @@ class TestNotifications(BaseTestCase): @@
         Session().commit()
         self.u3 = self.u3.user_id
         super(TestNotifications, self).__init__(methodName=methodName)
     def setUp(self):
-        self.remove_all_notifications()
         remove_all_notifications()
         self.assertEqual([], Notification.query().all())
         self.assertEqual([], UserNotification.query().all())
     def test_create_notification(self):
         usrs = [self.u1, self.u2]
         notification = NotificationModel().create(created_by=self.u1,

0 comments (0 inline, 0 general)