kallithea Changeset - 5adc4ad9ce77

Changeset - 5adc4ad9ce77

Parent rev.

Child rev.

[Not reviewed]

default

0 19 0

Thomas De Schampheleire - 10 years ago 2016-02-10 18:29:43
thomas.de.schampheleire@gmail.com

pytest migration: convert simple functional tests to TestControllerPytest

Replace usage of TestController with TestControllerPytest for those files in
tests/functional where there is no setUp/tearDown method (the pytest
equivalent to be investigated) and that do not use test parametrization.

19 files changed with 19 insertions and 19 deletions:

kallithea/tests/functional/test_admin_auth_settings.py

kallithea/tests/functional/test_admin_defaults.py

kallithea/tests/functional/test_admin_permissions.py

kallithea/tests/functional/test_admin_repo_groups.py

kallithea/tests/functional/test_admin_settings.py

kallithea/tests/functional/test_admin_user_groups.py

kallithea/tests/functional/test_admin_users.py

kallithea/tests/functional/test_branches.py

kallithea/tests/functional/test_changelog.py

kallithea/tests/functional/test_changeset.py

kallithea/tests/functional/test_compare_local.py

kallithea/tests/functional/test_feed.py

kallithea/tests/functional/test_followers.py

kallithea/tests/functional/test_home.py

kallithea/tests/functional/test_journal.py

kallithea/tests/functional/test_pullrequests.py

kallithea/tests/functional/test_repo_groups.py

kallithea/tests/functional/test_summary.py

kallithea/tests/functional/test_tags.py

0 comments (0 inline, 0 general)

kallithea/tests/functional/test_admin_auth_settings.py

➞

Show inline comments

 from kallithea.tests import *
 from kallithea.model.db import Setting
-class TestAuthSettingsController(TestController):
+class TestAuthSettingsController(TestControllerPytest):
     def _enable_plugins(self, plugins_list):
         test_url = url(controller='admin/auth_settings',
                        action='auth_settings')
         params={'auth_plugins': plugins_list, '_authentication_token': self.authentication_token()}
         for plugin in plugins_list.split(','):

kallithea/tests/functional/test_admin_defaults.py

➞

Show inline comments

 from kallithea.tests import *
 from kallithea.model.db import Setting
-class TestDefaultsController(TestController):
+class TestDefaultsController(TestControllerPytest):
     def test_index(self):
         self.log_user()
         response = self.app.get(url('defaults'))
         response.mustcontain('default_repo_private')
         response.mustcontain('default_repo_enable_statistics')

kallithea/tests/functional/test_admin_permissions.py

➞

Show inline comments

 from kallithea.model.db import User, UserIpMap
 from kallithea.tests import *
-class TestAdminPermissionsController(TestController):
+class TestAdminPermissionsController(TestControllerPytest):
     def test_index(self):
         self.log_user()
         response = self.app.get(url('admin_permissions'))
         # Test response...

kallithea/tests/functional/test_admin_repo_groups.py

➞

Show inline comments

 from kallithea.tests import *
-class TestRepoGroupsController(TestController):
+class TestRepoGroupsController(TestControllerPytest):
     pass

kallithea/tests/functional/test_admin_settings.py

➞

Show inline comments

@@ @@ -4,13 +4,13 @@ from kallithea.model.db import Setting, @@
 from kallithea.tests import *
 from kallithea.tests.fixture import Fixture
 fixture = Fixture()
-class TestAdminSettingsController(TestController):
+class TestAdminSettingsController(TestControllerPytest):
     def test_index_main(self):
         self.log_user()
         response = self.app.get(url('admin_settings'))
     def test_index_mapping(self):

kallithea/tests/functional/test_admin_user_groups.py

➞

Show inline comments

@@ @@ -3,13 +3,13 @@ from kallithea.tests import * @@
 from kallithea.model.db import UserGroup, UserGroupToPerm, Permission
 from kallithea.model.meta import Session
 TEST_USER_GROUP = u'admins_test'
-class TestAdminUsersGroupsController(TestController):
+class TestAdminUsersGroupsController(TestControllerPytest):
     def test_index(self):
         self.log_user()
         response = self.app.get(url('users_groups'))
         # Test response...

kallithea/tests/functional/test_admin_users.py

➞

Show inline comments

@@ @@ -529,13 +529,13 @@ class TestAdminUsersController(TestContr @@
 #        assert u._get_user_or_raise_if_default(user.user_id) == user
 #        # the default user should raise
 #        with pytest.raises(HTTPNotFound):
 #            u._get_user_or_raise_if_default(User.get_default_user().user_id)
-class TestAdminUsersControllerForDefaultUser(TestController):
+class TestAdminUsersControllerForDefaultUser(TestControllerPytest):
     """
     Edit actions on the default user are not allowed.
     Validate that they throw a 404 exception.
     """
     def test_edit_default_user(self):
         self.log_user()

kallithea/tests/functional/test_branches.py

➞

Show inline comments

 from kallithea.tests import *
-class TestBranchesController(TestController):
+class TestBranchesController(TestControllerPytest):
     def test_index_hg(self):
         self.log_user()
         response = self.app.get(url(controller='branches',
                                     action='index', repo_name=HG_REPO))
         response.mustcontain("""<a href="/%s/changelog?branch=default">default</a>""" % HG_REPO)

kallithea/tests/functional/test_changelog.py

➞

Show inline comments

 from kallithea.tests import *
-class TestChangelogController(TestController):
+class TestChangelogController(TestControllerPytest):
     def test_index_hg(self):
         self.log_user()
         response = self.app.get(url(controller='changelog', action='index',
                                     repo_name=HG_REPO))

kallithea/tests/functional/test_changeset.py

➞

Show inline comments

 from kallithea.tests import *
-class TestChangesetController(TestController):
+class TestChangesetController(TestControllerPytest):
     def test_index(self):
         response = self.app.get(url(controller='changeset', action='index',
                                     repo_name=HG_REPO, revision='tip'))
         # Test response...

kallithea/tests/functional/test_compare_local.py

➞

Show inline comments

 # -*- coding: utf-8 -*-
 from kallithea.tests import *
-class TestCompareController(TestController):
+class TestCompareController(TestControllerPytest):
     def test_compare_tag_hg(self):
         self.log_user()
         tag1 = 'v0.1.2'
         tag2 = 'v0.1.3'
         response = self.app.get(url('compare_url',

kallithea/tests/functional/test_feed.py

➞

Show inline comments

 from kallithea.tests import *
-class TestFeedController(TestController):
+class TestFeedController(TestControllerPytest):
     def test_rss(self):
         self.log_user()
         response = self.app.get(url(controller='feed', action='rss',
                                     repo_name=HG_REPO))

kallithea/tests/functional/test_followers.py

➞

Show inline comments

 from kallithea.tests import *
-class TestFollowersController(TestController):
+class TestFollowersController(TestControllerPytest):
     def test_index_hg(self):
         self.log_user()
         repo_name = HG_REPO
         response = self.app.get(url(controller='followers',
                                     action='followers',

kallithea/tests/functional/test_home.py

➞

Show inline comments

@@ @@ -6,13 +6,13 @@ from kallithea.model.repo import RepoMod @@
 from kallithea.model.repo_group import RepoGroupModel
 fixture = Fixture()
-class TestHomeController(TestController):
+class TestHomeController(TestControllerPytest):
     def test_index(self):
         self.log_user()
         response = self.app.get(url(controller='home', action='index'))
         #if global permission is set
         response.mustcontain('Add Repository')

kallithea/tests/functional/test_journal.py

➞

Show inline comments

 from kallithea.tests import *
 import datetime
-class TestJournalController(TestController):
+class TestJournalController(TestControllerPytest):
     def test_index(self):
         self.log_user()
         response = self.app.get(url(controller='journal', action='index'))
         response.mustcontain("""<div class="journal_day">%s</div>""" % datetime.date.today())

kallithea/tests/functional/test_pullrequests.py

➞

Show inline comments

@@ @@ -5,13 +5,13 @@ from kallithea.tests.fixture import Fixt @@
 from kallithea.model.meta import Session
 from kallithea.controllers.pullrequests import PullrequestsController
 fixture = Fixture()
-class TestPullrequestsController(TestController):
+class TestPullrequestsController(TestControllerPytest):
     def test_index(self):
         self.log_user()
         response = self.app.get(url(controller='pullrequests', action='index',
                                     repo_name=HG_REPO))

kallithea/tests/functional/test_repo_groups.py

➞

Show inline comments

 from kallithea.tests import *
-class TestRepoGroupsController(TestController):
+class TestRepoGroupsController(TestControllerPytest):
     def test_index(self):
         self.log_user()
         response = self.app.get(url('repos_groups'))
         response.mustcontain('{"totalRecords": 0, "sort": null, "startIndex": 0, "dir": "asc", "records": []};')

kallithea/tests/functional/test_summary.py

➞

Show inline comments

@@ @@ -19,13 +19,13 @@ from kallithea.model.repo import RepoMod @@
 from kallithea.model.meta import Session
 from kallithea.model.scm import ScmModel
 fixture = Fixture()
-class TestSummaryController(TestController):
+class TestSummaryController(TestControllerPytest):
     def test_index(self):
         self.log_user()
         ID = Repository.get_by_repo_name(HG_REPO).repo_id
         response = self.app.get(url(controller='summary',
                                     action='index',

kallithea/tests/functional/test_tags.py

➞

Show inline comments

 from kallithea.tests import *
-class TestTagsController(TestController):
+class TestTagsController(TestControllerPytest):
     def test_index_hg(self):
         self.log_user()
         response = self.app.get(url(controller='tags', action='index', repo_name=HG_REPO))
         response.mustcontain("""<a href="/%s/changeset/96507bd11ecc815ebc6270fdf6db110928c09c1e">tip</a>""" % HG_REPO)
         response.mustcontain("""<a href="/%s/changeset/2c96c02def9a7c997f33047761a53943e6254396">v0.2.0</a>""" % HG_REPO)

0 comments (0 inline, 0 general)