kallithea Changeset - 7f2aa3ec2931

Changeset - 7f2aa3ec2931

Parent rev.

Child rev.

[Not reviewed]

default

0 45 0

Thomas De Schampheleire - 10 years ago 2016-05-15 22:37:37
thomas.de.schampheleire@gmail.com

pytest migration: rename TestControllerPytest back to TestController

The name TestControllerPytest was introduced to allow a temporary situation
where nose/unittest and pytest-based tests could coexist.
This situation is now over, so the base test class can be renamed again.

45 files changed with 51 insertions and 51 deletions:

kallithea/tests/__init__.py

kallithea/tests/api/test_api_git.py

kallithea/tests/api/test_api_hg.py

kallithea/tests/functional/test_admin.py

kallithea/tests/functional/test_admin_auth_settings.py

kallithea/tests/functional/test_admin_defaults.py

kallithea/tests/functional/test_admin_gists.py

kallithea/tests/functional/test_admin_notifications.py

kallithea/tests/functional/test_admin_permissions.py

kallithea/tests/functional/test_admin_repo_groups.py

kallithea/tests/functional/test_admin_repos.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_changeset_comments.py

kallithea/tests/functional/test_compare.py

kallithea/tests/functional/test_compare_local.py

kallithea/tests/functional/test_feed.py

kallithea/tests/functional/test_files.py

kallithea/tests/functional/test_followers.py

kallithea/tests/functional/test_forks.py

kallithea/tests/functional/test_home.py

kallithea/tests/functional/test_journal.py

kallithea/tests/functional/test_login.py

kallithea/tests/functional/test_my_account.py

kallithea/tests/functional/test_pullrequests.py

kallithea/tests/functional/test_repo_groups.py

kallithea/tests/functional/test_search.py

kallithea/tests/functional/test_summary.py

kallithea/tests/functional/test_tags.py

kallithea/tests/models/test_changeset_status.py

kallithea/tests/models/test_diff_parsers.py

kallithea/tests/models/test_notifications.py

kallithea/tests/models/test_permissions.py

kallithea/tests/models/test_repo_groups.py

kallithea/tests/models/test_repos.py

kallithea/tests/models/test_user_groups.py

kallithea/tests/models/test_users.py

kallithea/tests/other/manual_test_vcs_operations.py

kallithea/tests/other/test_libs.py

kallithea/tests/other/test_mail.py

kallithea/tests/other/test_validators.py

0 comments (0 inline, 0 general)

kallithea/tests/__init__.py

➞

Show inline comments

@@ @@ -58,13 +58,13 @@ if not is_windows: @@
 log = logging.getLogger(__name__)
 skipif = pytest.mark.skipif
 parametrize = pytest.mark.parametrize
 __all__ = [
-    'skipif', 'parametrize', 'environ', 'url', 'TestControllerPytest',
+    'skipif', 'parametrize', 'environ', 'url', 'TestController',
     'ldap_lib_installed', 'pam_lib_installed',
     'TESTS_TMP_PATH', 'HG_REPO', 'GIT_REPO', 'NEW_HG_REPO', 'NEW_GIT_REPO',
     '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',
@@ @@ -145,13 +145,13 @@ except ImportError: @@
     pam_lib_installed = False
 class NullHandler(logging.Handler):
     def emit(self, record):
         pass
-class TestControllerPytest(object):
+class TestController(object):
     """Pytest-style test controller"""
     # Note: pytest base classes cannot have an __init__ method
     @pytest.fixture(autouse=True)
     def app_fixture(self):

kallithea/tests/api/test_api_git.py

➞

Show inline comments

@@ @@ -9,13 +9,13 @@ @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-from kallithea.tests import TestControllerPytest, GIT_REPO
+from kallithea.tests import TestController, GIT_REPO
 from kallithea.tests.api.api_base import _BaseTestApi
-class TestGitApi(_BaseTestApi, TestControllerPytest):
+class TestGitApi(_BaseTestApi, TestController):
     REPO = GIT_REPO
     REPO_TYPE = 'git'

kallithea/tests/api/test_api_hg.py

➞

Show inline comments

@@ @@ -9,13 +9,13 @@ @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-from kallithea.tests import TestControllerPytest, HG_REPO
+from kallithea.tests import TestController, HG_REPO
 from kallithea.tests.api.api_base import _BaseTestApi
-class TestHgApi(_BaseTestApi, TestControllerPytest):
+class TestHgApi(_BaseTestApi, TestController):
     REPO = HG_REPO
     REPO_TYPE = 'hg'

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(TestControllerPytest):
+class TestAdminController(TestController):
     @classmethod
     def setup_class(cls):
         UserLog.query().delete()
         Session().commit()

kallithea/tests/functional/test_admin_auth_settings.py

➞

Show inline comments

 from kallithea.tests import *
 from kallithea.model.db import Setting
-class TestAuthSettingsController(TestControllerPytest):
+class TestAuthSettingsController(TestController):
     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(TestControllerPytest):
+class TestDefaultsController(TestController):
     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_gists.py

➞

Show inline comments

@@ @@ -15,13 +15,13 @@ def _create_gist(f_name, content='some g @@
                        gist_mapping=gist_mapping, gist_type=gist_type,
                        lifetime=lifetime)
     Session().commit()
     return gist
-class TestGistsController(TestControllerPytest):
+class TestGistsController(TestController):
     def teardown_method(self, method):
         for g in Gist.get_all():
             GistModel().delete(g)
         Session().commit()

kallithea/tests/functional/test_admin_notifications.py

➞

Show inline comments

@@ @@ -4,13 +4,13 @@ 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(TestControllerPytest):
+class TestNotificationsController(TestController):
     def setup_method(self, method):
         self.remove_all_notifications()
     def test_index(self):
         self.log_user()

kallithea/tests/functional/test_admin_permissions.py

➞

Show inline comments

 import time
 from kallithea.model.db import User, UserIpMap
 from kallithea.tests import *
-class TestAdminPermissionsController(TestControllerPytest):
+class TestAdminPermissionsController(TestController):
     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(TestControllerPytest):
+class TestRepoGroupsController(TestController):
     pass

kallithea/tests/functional/test_admin_repos.py

➞

Show inline comments

@@ @@ -24,13 +24,13 @@ def _get_permission_for_user(user, repo) @@
                         Repository.get_by_repo_name(repo)) \
                 .filter(UserRepoToPerm.user == User.get_by_username(user)) \
                 .all()
     return perm
-class _BaseTestCase(TestControllerPytest):
+class _BaseTestCase(TestController):
     """
     Write all tests here
     """
     REPO = None
     REPO_TYPE = None
     NEW_REPO = None

kallithea/tests/functional/test_admin_settings.py

➞

Show inline comments

@@ @@ -6,13 +6,13 @@ from kallithea.model.db import Setting, @@
 from kallithea.tests import *
 from kallithea.tests.fixture import Fixture
 fixture = Fixture()
-class TestAdminSettingsController(TestControllerPytest):
+class TestAdminSettingsController(TestController):
     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(TestControllerPytest):
+class TestAdminUsersGroupsController(TestController):
     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

@@ @@ -26,13 +26,13 @@ from kallithea.lib import helpers as h @@
 from kallithea.model.meta import Session
 from webob.exc import HTTPNotFound
 fixture = Fixture()
-class TestAdminUsersController(TestControllerPytest):
+class TestAdminUsersController(TestController):
     test_user_1 = 'testme'
     @classmethod
     def teardown_class(cls):
         if User.get_by_username(cls.test_user_1):
             UserModel().delete(cls.test_user_1)
@@ @@ -527,13 +527,13 @@ class TestAdminUsersController_unittest( @@
         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(TestControllerPytest):
+class TestAdminUsersControllerForDefaultUser(TestController):
     """
     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(TestControllerPytest):
+class TestBranchesController(TestController):
     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(TestControllerPytest):
+class TestChangelogController(TestController):
     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(TestControllerPytest):
+class TestChangesetController(TestController):
     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_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(TestControllerPytest):
+class TestChangeSetCommentsController(TestController):
     def setup_method(self, method):
         for x in ChangesetComment.query().all():
             Session().delete(x)
         Session().commit()

kallithea/tests/functional/test_compare.py

➞

Show inline comments

@@ @@ -7,13 +7,13 @@ 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(TestControllerPytest):
+class TestCompareController(TestController):
     def setup_method(self, method):
         self.r1_id = None
         self.r2_id = None
     def teardown_method(self, method):

kallithea/tests/functional/test_compare_local.py

➞

Show inline comments

 # -*- coding: utf-8 -*-
 from kallithea.tests import *
-class TestCompareController(TestControllerPytest):
+class TestCompareController(TestController):
     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(TestControllerPytest):
+class TestFeedController(TestController):
     def test_rss(self):
         self.log_user()
         response = self.app.get(url(controller='feed', action='rss',
                                     repo_name=HG_REPO))

kallithea/tests/functional/test_files.py

➞

Show inline comments

@@ @@ -23,13 +23,13 @@ def _set_downloads(repo_name, set_to): @@
     repo = Repository.get_by_repo_name(repo_name)
     repo.enable_downloads = set_to
     Session().add(repo)
     Session().commit()
-class TestFilesController(TestControllerPytest):
+class TestFilesController(TestController):
     def test_index(self):
         self.log_user()
         response = self.app.get(url(controller='files', action='index',
                                     repo_name=HG_REPO,
                                     revision='tip',

kallithea/tests/functional/test_followers.py

➞

Show inline comments

 from kallithea.tests import *
-class TestFollowersController(TestControllerPytest):
+class TestFollowersController(TestController):
     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_forks.py

➞

Show inline comments

@@ @@ -9,13 +9,13 @@ 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()
-class _BaseTestCase(TestControllerPytest):
+class _BaseTestCase(TestController):
     """
     Write all tests here
     """
     REPO = None
     REPO_TYPE = None
     NEW_REPO = None

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(TestControllerPytest):
+class TestHomeController(TestController):
     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(TestControllerPytest):
+class TestJournalController(TestController):
     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_login.py

➞

Show inline comments

@@ @@ -16,13 +16,13 @@ from kallithea.model.db import User, Not @@
 from kallithea.model.meta import Session
 from kallithea.model.user import UserModel
 fixture = Fixture()
-class TestLoginController(TestControllerPytest):
+class TestLoginController(TestController):
     def setup_method(self, method):
         self.remove_all_notifications()
         assert Notification.query().all() == []
     def test_index(self):
         response = self.app.get(url(controller='login', action='index'))

kallithea/tests/functional/test_my_account.py

➞

Show inline comments

@@ @@ -7,13 +7,13 @@ from kallithea.lib import helpers as h @@
 from kallithea.model.user import UserModel
 from kallithea.model.meta import Session
 fixture = Fixture()
-class TestMyAccountController(TestControllerPytest):
+class TestMyAccountController(TestController):
     test_user_1 = 'testme'
     @classmethod
     def teardown_class(cls):
         if User.get_by_username(cls.test_user_1):
             UserModel().delete(cls.test_user_1)

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(TestControllerPytest):
+class TestPullrequestsController(TestController):
     def test_index(self):
         self.log_user()
         response = self.app.get(url(controller='pullrequests', action='index',
                                     repo_name=HG_REPO))
@@ @@ -140,13 +140,13 @@ 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(TestControllerPytest):
+class TestPullrequestsGetRepoRefs(TestController):
     def setup_method(self, method):
         self.main = fixture.create_repo(u'main', repo_type='hg')
         Session.add(self.main)
         Session.commit()
         self.c = PullrequestsController()

kallithea/tests/functional/test_repo_groups.py

➞

Show inline comments

 from kallithea.tests import *
-class TestRepoGroupsController(TestControllerPytest):
+class TestRepoGroupsController(TestController):
     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_search.py

➞

Show inline comments

 import mock
 import os
 from kallithea.tests import *
-class TestSearchController(TestControllerPytest):
+class TestSearchController(TestController):
     def test_index(self):
         self.log_user()
         response = self.app.get(url(controller='search', action='index'))
         response.mustcontain('class="small" id="q" name="q" type="text"')

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(TestControllerPytest):
+class TestSummaryController(TestController):
     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(TestControllerPytest):
+class TestTagsController(TestController):
     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)

kallithea/tests/models/test_changeset_status.py

➞

Show inline comments

@@ @@ -4,13 +4,13 @@ from kallithea.model.db import Changeset @@
 class CSM(object): # ChangesetStatusMock
     def __init__(self, status):
         self.status = status
-class TestChangesetStatusCalculation(TestControllerPytest):
+class TestChangesetStatusCalculation(TestController):
     def setup_method(self, method):
         self.m = ChangesetStatusModel()
     @parametrize('name,expected_result,statuses', [
         ('empty list', CS.STATUS_UNDER_REVIEW, []),

kallithea/tests/models/test_diff_parsers.py

➞

Show inline comments

@@ @@ -268,13 +268,13 @@ DIFF_FIXTURES = { @@
           'binary': False,
           'ops': {RENAMED_FILENODE: 'file renamed from oh no to oh yes'}}),
     ],
+}
-class TestDiffLib(TestControllerPytest):
+class TestDiffLib(TestController):
     @parametrize('diff_fixture', DIFF_FIXTURES)
     def test_diff(self, diff_fixture):
         diff = fixture.load_resource(diff_fixture, strip=False)
         vcs = 'hg'
         if diff_fixture.startswith('git_'):

kallithea/tests/models/test_notifications.py

➞

Show inline comments

@@ @@ -4,13 +4,13 @@ from kallithea.model.db import User, Not @@
 from kallithea.model.user import UserModel
 from kallithea.model.meta import Session
 from kallithea.model.notification import NotificationModel
-class TestNotifications(TestControllerPytest):
+class TestNotifications(TestController):
     def setup_method(self, method):
         Session.remove()
         self.u1 = UserModel().create_or_update(username=u'u1',
                                         password=u'qweqwe',
                                         email=u'u1@example.com',

kallithea/tests/models/test_permissions.py

➞

Show inline comments

@@ @@ -12,13 +12,13 @@ from kallithea.lib.auth import AuthUser @@
 from kallithea.model.permission import PermissionModel
 fixture = Fixture()
-class TestPermissions(TestControllerPytest):
+class TestPermissions(TestController):
     @classmethod
     def setup_class(cls):
         #recreate default user to get a clean start
         PermissionModel().create_default_permissions(user=User.DEFAULT_USER,
                                                      force=True)

kallithea/tests/models/test_repo_groups.py

➞

Show inline comments

@@ @@ -31,13 +31,13 @@ def _update_repo(name, **kwargs): @@
     if not 'perms_updates' in kwargs:
         form_data['perms_updates'] = []
     r = RepoModel().update(name, **form_data)
     return r
-class TestRepoGroups(TestControllerPytest):
+class TestRepoGroups(TestController):
     def setup_method(self, method):
         self.g1 = fixture.create_repo_group(u'test1', skip_if_exists=True)
         self.g2 = fixture.create_repo_group(u'test2', skip_if_exists=True)
         self.g3 = fixture.create_repo_group(u'test3', skip_if_exists=True)

kallithea/tests/models/test_repos.py

➞

Show inline comments

@@ @@ -7,13 +7,13 @@ from kallithea.model.repo import RepoMod @@
 from kallithea.model.db import Repository
 from kallithea.lib.exceptions import AttachedForksError
 fixture = Fixture()
-class TestRepos(TestControllerPytest):
+class TestRepos(TestController):
     def teardown_method(self, method):
         Session.remove()
     def test_remove_repo(self):
         repo = fixture.create_repo(name=u'test-repo-1')

kallithea/tests/models/test_user_groups.py

➞

Show inline comments

@@ @@ -7,13 +7,13 @@ from kallithea.model.user_group import U @@
 from kallithea.model.meta import Session
 fixture = Fixture()
-class TestUserGroups(TestControllerPytest):
+class TestUserGroups(TestController):
     def teardown_method(self, method):
         # delete all groups
         for gr in UserGroupModel.get_all():
             fixture.destroy_user_group(gr)
         Session().commit()

kallithea/tests/models/test_users.py

➞

Show inline comments

@@ @@ -9,13 +9,13 @@ from kallithea.model.meta import Session @@
 from kallithea.model.user_group import UserGroupModel
 from kallithea.tests.fixture import Fixture
 fixture = Fixture()
-class TestUser(TestControllerPytest):
+class TestUser(TestController):
     @classmethod
     def setup_class(cls):
         Session.remove()
     def teardown_method(self, method):
@@ @@ -96,13 +96,13 @@ class TestUser(TestControllerPytest): @@
         UserModel().delete(usr.user_id)
         Session().commit()
-class TestUsers(TestControllerPytest):
+class TestUsers(TestController):
     def setup_method(self, method):
         self.u1 = UserModel().create_or_update(username=u'u1',
                                         password=u'qweqwe',
                                         email=u'u1@example.com',
                                         firstname=u'u1', lastname=u'u1')

kallithea/tests/other/manual_test_vcs_operations.py

➞

Show inline comments

@@ @@ -163,13 +163,13 @@ def _check_proper_git_push(stdout, stder @@
     assert 'fatal' not in stderr
     assert 'rejected' not in stderr
     assert 'Pushing to' in stderr
     assert 'master -> master' in stderr
-class TestVCSOperations(TestControllerPytest):
+class TestVCSOperations(TestController):
     @classmethod
     def setup_class(cls):
         #DISABLE ANONYMOUS ACCESS
         set_anonymous_access(False)

kallithea/tests/other/test_libs.py

➞

Show inline comments

@@ @@ -64,13 +64,13 @@ TEST_URLS += [ @@
     ('%s://user:pass@example.com:8080' % proto, ['%s://' % proto, 'example.com',
                                                 '8080'],
      '%s://example.com:8080' % proto),
+]
-class TestLibs(TestControllerPytest):
+class TestLibs(TestController):
     @parametrize('test_url,expected,expected_creds', TEST_URLS)
     def test_uri_filter(self, test_url, expected, expected_creds):
         from kallithea.lib.utils2 import uri_filter
         assert uri_filter(test_url) == expected

kallithea/tests/other/test_mail.py

➞

Show inline comments

@@ @@ -18,13 +18,13 @@ class smtplib_mock(object): @@
         smtplib_mock.lastsender = sender
         smtplib_mock.lastdest = dest
         smtplib_mock.lastmsg = msg
         pass
 @mock.patch('kallithea.lib.rcmail.smtp_mailer.smtplib', smtplib_mock)
-class TestMail(TestControllerPytest):
+class TestMail(TestController):
     def test_send_mail_trivial(self):
         mailserver = 'smtp.mailserver.org'
         recipients = ['rcpt1', 'rcpt2']
         envelope_from = 'noreply@mailserver.org'
         subject = 'subject'

kallithea/tests/other/test_validators.py

➞

Show inline comments

@@ @@ -12,13 +12,13 @@ from kallithea.model.meta import Session @@
 from kallithea.model.repo_group import RepoGroupModel
 from kallithea.tests.fixture import Fixture
 fixture = Fixture()
-class TestRepoGroups(TestControllerPytest):
+class TestRepoGroups(TestController):
     def teardown_method(self, method):
         Session.remove()
     def test_Message_extractor(self):
         validator = v.ValidUsername()

0 comments (0 inline, 0 general)