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

@@ @@ -7,13 +7,13 @@ 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()

kallithea/tests/functional/test_admin_gists.py

➞

Show inline comments

@@ @@ -15,15 +15,15 @@ def _create_gist(f_name, content='some g @@
                        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()

kallithea/tests/functional/test_admin_notifications.py

➞

Show inline comments

@@ @@ -4,14 +4,14 @@ 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',

kallithea/tests/functional/test_admin_repos.py

➞

Show inline comments

@@ @@ -601,20 +601,20 @@ class _BaseTest(object): @@
         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()

kallithea/tests/functional/test_compare.py

➞

Show inline comments

@@ @@ -7,19 +7,19 @@ from kallithea.tests.fixture import Fixt @@
 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()

kallithea/tests/functional/test_forks.py

➞

Show inline comments

@@ @@ -9,32 +9,29 @@ from kallithea.model.db import Repositor @@
 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):
     """
@@ @@ -221,18 +218,18 @@ class _BaseTestCase(object): @@
         # 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

@@ @@ -140,21 +140,21 @@ class TestPullrequestsController(TestCon @@
                                   '_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

0 comments (0 inline, 0 general)