kallithea Changeset - 15c40f8a3510

Changeset - 15c40f8a3510

Parent rev.

Child rev.

[Not reviewed]

default

0 8 0

Thomas De Schampheleire - 10 years ago 2016-04-26 17:35:13
thomas.de.schampheleire@gmail.com

pytest migration: convert functional tests with setup/teardown methods

pytest also supports setup/teardown methods like unittest (even though
pytest fixtures are more powerful and should be the end goal).
Only difference is the naming and signature of setUp (setup_method) and
tearDown (teardown_method).

8 files changed with 20 insertions and 23 deletions:

kallithea/tests/functional/test_admin.py

kallithea/tests/functional/test_admin_gists.py

kallithea/tests/functional/test_admin_notifications.py

kallithea/tests/functional/test_admin_repos.py

kallithea/tests/functional/test_changeset_comments.py

kallithea/tests/functional/test_compare.py

kallithea/tests/functional/test_forks.py

kallithea/tests/functional/test_pullrequests.py

0 comments (0 inline, 0 general)

kallithea/tests/functional/test_admin.py

➞

Show inline comments

 import os
 import csv
 import datetime
 from kallithea.tests import *
 from kallithea.model.db import UserLog
 from kallithea.model.meta import Session
 from kallithea.lib.utils2 import safe_unicode
 dn = os.path.dirname
 FIXTURES = os.path.join(dn(dn(os.path.abspath(__file__))), 'fixtures')
-class TestAdminController(TestController):
+class TestAdminController(TestControllerPytest):
     @classmethod
     def setup_class(cls):
         UserLog.query().delete()
         Session().commit()
         def strptime(val):
             fmt = '%Y-%m-%d %H:%M:%S'
             if '.' not in val:
                 return datetime.datetime.strptime(val, fmt)
             nofrag, frag = val.split(".")

kallithea/tests/functional/test_admin_gists.py

➞

Show inline comments

@@ @@ -9,27 +9,27 @@ def _create_gist(f_name, content='some g @@
                  owner=TEST_USER_ADMIN_LOGIN):
     gist_mapping = {
         f_name: {'content': content}
+    }
     user = User.get_by_username(owner)
     gist = GistModel().create(description, owner=user,
                        gist_mapping=gist_mapping, gist_type=gist_type,
                        lifetime=lifetime)
     Session().commit()
     return gist
-class TestGistsController(TestController):
+class TestGistsController(TestControllerPytest):
-    def tearDown(self):
+    def teardown_method(self, method):
         for g in Gist.get_all():
             GistModel().delete(g)
         Session().commit()
     def test_index(self):
         self.log_user()
         response = self.app.get(url('gists'))
         # Test response...
         response.mustcontain('There are no gists yet')
         g1 = _create_gist('gist1').gist_access_id
         g2 = _create_gist('gist2', lifetime=1400).gist_access_id

kallithea/tests/functional/test_admin_notifications.py

➞

Show inline comments

 from kallithea.tests import *
 from kallithea.model.db import User
 from kallithea.model.user import UserModel
 from kallithea.model.notification import NotificationModel
 from kallithea.model.meta import Session
 from kallithea.lib import helpers as h
 class TestNotificationsController(TestController):
     def setUp(self):
 class TestNotificationsController(TestControllerPytest):
     def setup_method(self, method):
         remove_all_notifications()
     def test_index(self):
         self.log_user()
         u1 = UserModel().create_or_update(username='u1', password='qweqwe',
                                           email='u1@example.com',
                                           firstname=u'u1', lastname=u'u1')
         u1 = u1.user_id
         Session().commit()
         response = self.app.get(url('notifications'))

kallithea/tests/functional/test_admin_repos.py

➞

Show inline comments

@@ @@ -595,26 +595,26 @@ class _BaseTest(object): @@
                                                 repo_description=description,
                                                 _authentication_token=self.authentication_token()))
         self.checkSessionFlash(response,
                                'Error creating repository %s' % repo_name)
         # repo must not be in db
         repo = Repository.get_by_repo_name(repo_name)
         self.assertEqual(repo, None)
         # repo must not be in filesystem !
         self.assertFalse(os.path.isdir(os.path.join(Ui.get_by_key('paths', '/').ui_value, repo_name)))
-class TestAdminReposControllerGIT(TestController, _BaseTest):
+class TestAdminReposControllerGIT(TestControllerPytest, _BaseTest):
     REPO = GIT_REPO
     REPO_TYPE = 'git'
     NEW_REPO = NEW_GIT_REPO
     OTHER_TYPE_REPO = HG_REPO
     OTHER_TYPE = 'hg'
-class TestAdminReposControllerHG(TestController, _BaseTest):
+class TestAdminReposControllerHG(TestControllerPytest, _BaseTest):
     REPO = HG_REPO
     REPO_TYPE = 'hg'
     NEW_REPO = NEW_HG_REPO
     OTHER_TYPE_REPO = GIT_REPO
     OTHER_TYPE = 'git'

kallithea/tests/functional/test_changeset_comments.py

➞

Show inline comments

 from kallithea.tests import *
 from kallithea.model.db import ChangesetComment, Notification, \
     UserNotification
 from kallithea.model.meta import Session
-class TestChangeSetCommentsController(TestController):
+class TestChangeSetCommentsController(TestControllerPytest):
-    def setUp(self):
+    def setup_method(self, method):
         for x in ChangesetComment.query().all():
             Session().delete(x)
         Session().commit()
         remove_all_notifications()
     def test_create(self):
         self.log_user()
         rev = '27cd5cce30c96924232dffcd24178a07ffeb5dfc'
         text = u'CommentOnRevision'
         params = {'text': text, '_authentication_token': self.authentication_token()}

kallithea/tests/functional/test_compare.py

➞

Show inline comments

 # -*- coding: utf-8 -*-
 from kallithea.tests import *
 from kallithea.model.repo import RepoModel
 from kallithea.model.meta import Session
 from kallithea.tests.fixture import Fixture
 fixture = Fixture()
 def _commit_div(sha, msg):
     return """<div id="C-%s" class="message">%s</div>""" % (sha, msg)
-class TestCompareController(TestController):
+class TestCompareController(TestControllerPytest):
-    def setUp(self):
+    def setup_method(self, method):
         self.r1_id = None
         self.r2_id = None
-    def tearDown(self):
+    def teardown_method(self, method):
         if self.r2_id:
             RepoModel().delete(self.r2_id)
         if self.r1_id:
             RepoModel().delete(self.r1_id)
         Session().commit()
         Session.remove()
     def test_compare_forks_on_branch_extra_commits_hg(self):
         self.log_user()
         repo1 = fixture.create_repo(u'one', repo_type='hg',
                                     repo_description='diff-test',
                                     cur_user=TEST_USER_ADMIN_LOGIN)

kallithea/tests/functional/test_forks.py

➞

Show inline comments

@@ @@ -3,44 +3,41 @@ @@
 import unittest
 from kallithea.tests import *
 from kallithea.tests.fixture import Fixture
 from kallithea.model.db import Repository
 from kallithea.model.repo import RepoModel
 from kallithea.model.user import UserModel
 from kallithea.model.meta import Session
 fixture = Fixture()
 from kallithea.tests import *
 class _BaseFixture(unittest.TestCase):
 class _BaseFixture(object):
     @classmethod
     def setup_class(cls):
         pass
     @classmethod
     def teardown_class(cls):
         pass
-    def setUp(self):
+    def setup_method(self, method):
         self.username = u'forkuser'
         self.password = u'qweqwe'
         self.u1 = fixture.create_user(self.username, password=self.password,
                                       email=u'fork_king@example.com')
         Session().commit()
-    def tearDown(self):
+    def teardown_method(self, method):
         Session().delete(self.u1)
         Session().commit()
 class _BaseTestCase(object):
     """
     Write all tests here
     """
     REPO = None
     REPO_TYPE = None
     NEW_REPO = None
     REPO_FORK = None
@@ @@ -215,24 +212,24 @@ class _BaseTestCase(object): @@
         self.assertEqual(1, len(forks))
         # set none
         RepoModel().grant_user_permission(repo=forks[0],
                                           user=usr, perm='repository.none')
         Session().commit()
         # fork shouldn't be there
         response = self.app.get(url(controller='forks', action='forks',
                                     repo_name=repo_name))
         response.mustcontain('There are no forks yet')
-class TestGIT(TestController, _BaseTestCase, _BaseFixture):
+class TestGIT(TestControllerPytest, _BaseTestCase, _BaseFixture):
     REPO = GIT_REPO
     NEW_REPO = NEW_GIT_REPO
     REPO_TYPE = 'git'
     REPO_FORK = GIT_FORK
-class TestHG(TestController, _BaseTestCase, _BaseFixture):
+class TestHG(TestControllerPytest, _BaseTestCase, _BaseFixture):
     REPO = HG_REPO
     NEW_REPO = NEW_HG_REPO
     REPO_TYPE = 'hg'
     REPO_FORK = HG_FORK

kallithea/tests/functional/test_pullrequests.py

➞

Show inline comments

@@ @@ -134,33 +134,33 @@ class TestPullrequestsController(TestCon @@
         response = self.app.post(url(controller='pullrequests', action='post',
                                      repo_name=HG_REPO, pull_request_id=pull_request_id),
+                                 {
                                   'pullrequest_title': 'title',
                                   'pullrequest_desc': 'description',
                                   'owner': TEST_USER_ADMIN_LOGIN,
                                   '_authentication_token': self.authentication_token(),
                                   'review_members': invalid_user_id,
                                  },
                                  status=400)
         response.mustcontain('Invalid reviewer &#34;%s&#34; specified' % invalid_user_id)
-class TestPullrequestsGetRepoRefs(TestController):
+class TestPullrequestsGetRepoRefs(TestControllerPytest):
-    def setUp(self):
+    def setup_method(self, method):
         self.main = fixture.create_repo(u'main', repo_type='hg')
         Session.add(self.main)
         Session.commit()
         self.c = PullrequestsController()
-    def tearDown(self):
+    def teardown_method(self, method):
         fixture.destroy_repo(u'main')
         Session.commit()
         Session.remove()
     def test_repo_refs_empty_repo(self):
         # empty repo with no commits, no branches, no bookmarks, just one tag
         refs, default = self.c._get_repo_refs(self.main.scm_instance)
         self.assertEqual(default, 'tag:null:0000000000000000000000000000000000000000')
     def test_repo_refs_one_commit_no_hints(self):
         cs0 = fixture.commit_change(self.main.repo_name, filename='file1',
                 content='line1\n', message='commit1', vcs_type='hg',

0 comments (0 inline, 0 general)