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

@@ @@ -52,25 +52,25 @@ from kallithea.lib.utils2 import safe_st @@
 os.environ['TZ'] = 'UTC'
 if not is_windows:
     time.tzset()
 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',
     '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',
+]
 # Invoke websetup with the current config file
@@ @@ -139,25 +139,25 @@ except ImportError: @@
 try:
     import pam
     pam.PAM_TEXT_INFO
     pam_lib_installed = True
 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):
         self.wsgiapp = pylons.test.pylonsapp
         self.init_stack(self.wsgiapp.config)
         self.app = TestApp(self.wsgiapp)
         self.maxDiff = None
         self.index_location = config['app_conf']['index_dir']
         return self.app

kallithea/tests/api/test_api_git.py

➞

Show inline comments

@@ @@ -3,19 +3,19 @@ @@
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # 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

@@ @@ -3,19 +3,19 @@ @@
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # 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

 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(TestControllerPytest):
+class TestAdminController(TestController):
     @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_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(','):
             enable = plugin.partition('kallithea.lib.auth_modules.')[-1]
             params.update({'%s_enabled' % enable: True})
         response = self.app.post(url=test_url, params=params)
         return params
         #self.checkSessionFlash(response, 'Auth settings updated successfully')

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')
         response.mustcontain('default_repo_enable_downloads')
         response.mustcontain('default_repo_enable_locking')
     def test_index_as_xml(self):
         response = self.app.get(url('formatted_defaults', format='xml'))

kallithea/tests/functional/test_admin_gists.py

➞

Show inline comments

@@ @@ -9,25 +9,25 @@ 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(TestControllerPytest):
+class TestGistsController(TestController):
     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')

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(TestControllerPytest):
+class TestNotificationsController(TestController):
     def setup_method(self, method):
         self.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()

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...
     def test_index_ips(self):
         self.log_user()
         response = self.app.get(url('admin_permissions_ips'))
         # Test response...
         response.mustcontain('All IP addresses are allowed')

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

@@ @@ -18,25 +18,25 @@ from kallithea.tests.fixture import Fixt @@
 fixture = Fixture()
 def _get_permission_for_user(user, repo):
     perm = UserRepoToPerm.query() \
                 .filter(UserRepoToPerm.repository ==
                         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
     OTHER_TYPE_REPO = None
     OTHER_TYPE = None
     def test_index(self):
         self.log_user()
         response = self.app.get(url('repos'))

kallithea/tests/functional/test_admin_settings.py

➞

Show inline comments

 # -*- coding: utf-8 -*-
 import tempfile
 from kallithea.model.db import Setting, Ui
 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):
         self.log_user()
         response = self.app.get(url('admin_settings_mapping'))
     def test_index_global(self):
         self.log_user()
         response = self.app.get(url('admin_settings_global'))

kallithea/tests/functional/test_admin_user_groups.py

➞

Show inline comments

 # -*- coding: utf-8 -*-
 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...
     def test_create(self):
         self.log_user()
         users_group_name = TEST_USER_GROUP
         response = self.app.post(url('users_groups'),
                                  {'users_group_name': users_group_name,
                                   'user_group_description': u'DESC',

kallithea/tests/functional/test_admin_users.py

➞

Show inline comments

@@ @@ -20,25 +20,25 @@ from kallithea.tests.fixture import Fixt @@
 from kallithea.controllers.admin.users import UsersController
 from kallithea.model.db import User, Permission, UserIpMap, UserApiKeys
 from kallithea.lib.auth import check_password
 from kallithea.model.user import UserModel
 from kallithea.model import validators
 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)
             Session().commit()
     def test_index(self):
         self.log_user()
         response = self.app.get(url('users'))
         # Test response...
@@ @@ -521,25 +521,25 @@ class TestAdminUsersController_unittest( @@
             pass
         monkeypatch.setattr(h, 'flash', flash_mock)
         u = UsersController()
         # a regular user should work correctly
         user = User.get_by_username(TEST_USER_REGULAR_LOGIN)
         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()
         user = User.get_default_user()
         response = self.app.get(url('edit_user', id=user.user_id), status=404)
     def test_edit_advanced_default_user(self):
         self.log_user()
         user = User.get_default_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)
         # closed branches
         response.mustcontain("""<a href="/%s/changelog?branch=git">git [closed]</a>""" % HG_REPO)
         response.mustcontain("""<a href="/%s/changelog?branch=web">web [closed]</a>""" % HG_REPO)
     def test_index_git(self):

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))
         response.mustcontain('''id="chg_20" class="container mergerow"''')
         response.mustcontain(
             """<input class="changeset_range" """
             """id="7b22a518347bb9bc19679f6af07cd0a61bfe16e7" """
             """name="7b22a518347bb9bc19679f6af07cd0a61bfe16e7" """
             """type="checkbox" value="1" />"""

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...
     def test_changeset_range(self):
         #print self.app.get(url(controller='changelog', action='index', repo_name=HG_REPO))
         response = self.app.get(url(controller='changeset', action='index',
                                     repo_name=HG_REPO, revision='a53d9201d4bc278910d416d94941b7ea007ecd52...96507bd11ecc815ebc6270fdf6db110928c09c1e'))

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()
         self.remove_all_notifications()
     def test_create(self):
         self.log_user()
         rev = '27cd5cce30c96924232dffcd24178a07ffeb5dfc'
         text = u'CommentOnRevision'

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(TestControllerPytest):
+class TestCompareController(TestController):
     def setup_method(self, method):
         self.r1_id = None
         self.r2_id = None
     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_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',
                                     repo_name=HG_REPO,
                                     org_ref_type="tag",
                                     org_ref_name=tag1,
                                     other_ref_type="tag",
                                     other_ref_name=tag2,
                                     ), status=200)

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))
         assert response.content_type == "application/rss+xml"
         assert """<rss version="2.0">""" in response
     def test_atom(self):

kallithea/tests/functional/test_files.py

➞

Show inline comments

@@ @@ -17,25 +17,25 @@ ARCHIVE_SPECS = { @@
 HG_NODE_HISTORY = fixture.load_resource('hg_node_history_response.json')
 GIT_NODE_HISTORY = fixture.load_resource('git_node_history_response.json')
 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',
                                     f_path='/'))
         # Test response...
         response.mustcontain('<a class="browser-dir ypjax-link" href="/%s/files/96507bd11ecc815ebc6270fdf6db110928c09c1e/docs"><i class="icon-folder-open"></i><span>docs</span></a>' % HG_REPO)
         response.mustcontain('<a class="browser-dir ypjax-link" href="/%s/files/96507bd11ecc815ebc6270fdf6db110928c09c1e/vcs"><i class="icon-folder-open"></i><span>vcs</span></a>' % HG_REPO)
         response.mustcontain('<a class="browser-file ypjax-link" href="/%s/files/96507bd11ecc815ebc6270fdf6db110928c09c1e/.gitignore"><i class="icon-doc"></i><span>.gitignore</span></a>' % HG_REPO)
         response.mustcontain('<a class="browser-file ypjax-link" href="/%s/files/96507bd11ecc815ebc6270fdf6db110928c09c1e/.hgignore"><i class="icon-doc"></i><span>.hgignore</span></a>' % HG_REPO)

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',
                                     repo_name=repo_name))
         response.mustcontain(TEST_USER_ADMIN_LOGIN)
         response.mustcontain("""Started following""")
     def test_index_git(self):

kallithea/tests/functional/test_forks.py

➞

Show inline comments

@@ @@ -3,25 +3,25 @@ @@
 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()
-class _BaseTestCase(TestControllerPytest):
+class _BaseTestCase(TestController):
     """
     Write all tests here
     """
     REPO = None
     REPO_TYPE = None
     NEW_REPO = None
     REPO_FORK = None
     def setup_method(self, method):
         self.username = u'forkuser'
         self.password = u'qweqwe'
         self.u1 = fixture.create_user(self.username, password=self.password,

kallithea/tests/functional/test_home.py

➞

Show inline comments

 from kallithea.tests import *
 from kallithea.tests.fixture import Fixture
 from kallithea.model.meta import Session
 from kallithea.model.db import Repository
 from kallithea.model.repo import RepoModel
 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')
         # html in javascript variable:
         response.mustcontain('var data = {"totalRecords": %s' % len(Repository.getAll()))
         response.mustcontain(r'href=\"/%s\"' % HG_REPO)
         response.mustcontain(r'<span class="repotag">git')
         response.mustcontain(r'<i class=\"icon-globe\"')

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())
     def test_stop_following_repository(self):
         session = self.log_user()
 #        usr = Session().query(User).filter(User.username == TEST_USER_ADMIN_LOGIN).one()
 #        repo = Session().query(Repository).filter(Repository.repo_name == HG_REPO).one()
+#

kallithea/tests/functional/test_login.py

➞

Show inline comments

@@ @@ -10,25 +10,25 @@ from kallithea.tests.fixture import Fixt @@
 from kallithea.lib.utils2 import generate_api_key
 from kallithea.lib.auth import check_password
 from kallithea.lib import helpers as h
 from kallithea.model.api_key import ApiKeyModel
 from kallithea.model import validators
 from kallithea.model.db import User, Notification
 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'))
         assert response.status == '200 OK'
         # Test response...
     def test_login_admin_ok(self):
         response = self.app.post(url(controller='login', action='index'),
                                  {'username': TEST_USER_ADMIN_LOGIN,

kallithea/tests/functional/test_my_account.py

➞

Show inline comments

 # -*- coding: utf-8 -*-
 from kallithea.model.db import User, UserFollowing, Repository, UserApiKeys
 from kallithea.tests import *
 from kallithea.tests.fixture import Fixture
 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)
             Session().commit()
     def test_my_account(self):
         self.log_user()
         response = self.app.get(url('my_account'))

kallithea/tests/functional/test_pullrequests.py

➞

Show inline comments

 import re
 from kallithea.tests import *
 from kallithea.tests.fixture import Fixture
 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))
     def test_create_trivial(self):
         self.log_user()
         response = self.app.post(url(controller='pullrequests', action='create',
                                      repo_name=HG_REPO),
                                  {'org_repo': HG_REPO,
                                   'org_ref': 'branch:default:default',
@@ @@ -134,25 +134,25 @@ 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(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()
     def teardown_method(self, method):
         fixture.destroy_repo(u'main')
         Session.commit()
         Session.remove()

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": []};')
 #    def test_create(self):
 #        response = self.app.post(url('repos_groups'))
     def test_new(self):
         self.log_user()
         response = self.app.get(url('new_repos_group'))

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"')
         # Test response...
     def test_empty_search(self, tmpdir):
         self.log_user()
         config_mock = {

kallithea/tests/functional/test_summary.py

➞

Show inline comments

@@ @@ -13,25 +13,25 @@ @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 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.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',
                                     repo_name=HG_REPO))
         #repo type
         response.mustcontain(
             """<span class="repotag">hg"""
+        )

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)
         response.mustcontain("""<a href="/%s/changeset/fef5bfe1dc17611d5fb59a7f6f95c55c3606f933">v0.1.11</a>""" % HG_REPO)
         response.mustcontain("""<a href="/%s/changeset/92831aebf2f8dd4879e897024b89d09af214df1c">v0.1.10</a>""" % HG_REPO)
         response.mustcontain("""<a href="/%s/changeset/8680b1d1cee3aa3c1ab3734b76ee164bbedbc5c9">v0.1.9</a>""" % HG_REPO)
         response.mustcontain("""<a href="/%s/changeset/ecb25ba9c96faf1e65a0bc3fd914918420a2f116">v0.1.8</a>""" % HG_REPO)
         response.mustcontain("""<a href="/%s/changeset/f67633a2894edaf28513706d558205fa93df9209">v0.1.7</a>""" % HG_REPO)
         response.mustcontain("""<a href="/%s/changeset/02b38c0eb6f982174750c0e309ff9faddc0c7e12">v0.1.6</a>""" % HG_REPO)

kallithea/tests/models/test_changeset_status.py

➞

Show inline comments

 from kallithea.tests import *
 from kallithea.model.changeset_status import ChangesetStatusModel
 from kallithea.model.db import ChangesetStatus as CS
 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, []),
         ('approve', CS.STATUS_APPROVED, [CSM(CS.STATUS_APPROVED)]),
         ('approve2', CS.STATUS_APPROVED, [CSM(CS.STATUS_APPROVED), CSM(CS.STATUS_APPROVED)]),
         ('approve_reject', CS.STATUS_REJECTED, [CSM(CS.STATUS_APPROVED), CSM(CS.STATUS_REJECTED)]),
         ('approve_underreview', CS.STATUS_UNDER_REVIEW, [CSM(CS.STATUS_APPROVED), CSM(CS.STATUS_UNDER_REVIEW)]),
         ('approve_notreviewed', CS.STATUS_UNDER_REVIEW, [CSM(CS.STATUS_APPROVED), CSM(CS.STATUS_NOT_REVIEWED)]),
         ('underreview', CS.STATUS_UNDER_REVIEW, [CSM(CS.STATUS_UNDER_REVIEW), CSM(CS.STATUS_UNDER_REVIEW)]),

kallithea/tests/models/test_diff_parsers.py

➞

Show inline comments

@@ @@ -262,25 +262,25 @@ DIFF_FIXTURES = { @@
                   MOD_FILENODE: 'modified file'}}),
     ],
     'hg_diff_rename_space_cr.diff': [
         ('oh yes', 'R',
          {'added': 3,
           'deleted': 2,
           '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_'):
             vcs = 'git'
         diff_proc = DiffProcessor(diff, vcs=vcs)
         diff_proc_d = diff_proc.prepare()
         data = [(x['filename'], x['operation'], x['stats']) for x in diff_proc_d]
         expected_data = DIFF_FIXTURES[diff_fixture]
         assert expected_data == data

kallithea/tests/models/test_notifications.py

➞

Show inline comments

 from kallithea.tests import *
 from kallithea.model.db import User, Notification, UserNotification
 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',
                                         firstname=u'u1', lastname=u'u1')
         Session().commit()
         self.u1 = self.u1.user_id
         self.u2 = UserModel().create_or_update(username=u'u2',
                                         password=u'qweqwe',

kallithea/tests/models/test_permissions.py

➞

Show inline comments

@@ @@ -6,25 +6,25 @@ from kallithea.model.db import RepoGroup @@
     Permission, UserToPerm
 from kallithea.model.user import UserModel
 from kallithea.model.meta import Session
 from kallithea.model.user_group import UserGroupModel
 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)
         Session().commit()
     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/models/test_repo_groups.py

➞

Show inline comments

@@ @@ -25,25 +25,25 @@ def _update_group(id_, group_name, desc= @@
 def _update_repo(name, **kwargs):
     form_data = fixture._get_repo_create_params(**kwargs)
     if not 'repo_name' in kwargs:
         form_data['repo_name'] = name
     if not 'perms_new' in kwargs:
         form_data['perms_new'] = []
     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)
     def teardown_method(self, method):
         Session.remove()
     def __check_path(self, *path):
         """
         Checks the path for existence !

kallithea/tests/models/test_repos.py

➞

Show inline comments

 import pytest
 from kallithea.tests import *
 from kallithea.model.meta import Session
 from kallithea.tests.fixture import Fixture
 from kallithea.model.repo import RepoModel
 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')
         Session().commit()
         RepoModel().delete(repo=repo)
         Session().commit()
         assert None == Repository.get_by_repo_name(repo_name=u'test-repo-1')

kallithea/tests/models/test_user_groups.py

➞

Show inline comments

 from kallithea.model.db import User
 from kallithea.tests import *
 from kallithea.tests.fixture import Fixture
 from kallithea.model.user_group import UserGroupModel
 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()
     @parametrize('pre_existing,regular_should_be,external_should_be,groups,expected', [
         ([], [], [], [], []),
         ([], [u'regular'], [], [], [u'regular']),  # no changes of regular
         ([u'some_other'], [], [], [u'some_other'], []),   # not added to regular group
         ([], [u'regular'], [u'container'], [u'container'], [u'regular', u'container']),

kallithea/tests/models/test_users.py

➞

Show inline comments

@@ @@ -3,25 +3,25 @@ from kallithea.tests import * @@
 from kallithea.model.db import User, UserGroup, UserGroupMember, UserEmailMap, \
     Permission
 from kallithea.model.user import UserModel
 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):
         Session.remove()
     def test_create_and_remove(self):
         usr = UserModel().create_or_update(username=u'test_user',
                                            password=u'qweqwe',
                                            email=u'u232@example.com',
@@ @@ -90,25 +90,25 @@ class TestUser(TestControllerPytest): @@
         assert None == u
         u = User.get_by_email(email='main_e%ail@example.com')
         assert None == u
         u = User.get_by_email(email='main_emai_@example.com')
         assert None == u
         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')
     def teardown_method(self, method):
         perm = Permission.query().all()
         for p in perm:
             UserModel().revoke_perm(self.u1, p)

kallithea/tests/other/manual_test_vcs_operations.py

➞

Show inline comments

@@ @@ -157,25 +157,25 @@ def set_anonymous_access(enable=True): @@
 # TESTS
 #==============================================================================
 def _check_proper_git_push(stdout, stderr):
     #WTF Git stderr is output ?!
     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)
     def setup_method(self, method):
         r = Repository.get_by_repo_name(GIT_REPO)
         Repository.unlock(r)
         r.enable_locking = False
         Session().add(r)
         Session().commit()

kallithea/tests/other/test_libs.py

➞

Show inline comments

@@ @@ -58,25 +58,25 @@ TEST_URLS += [ @@
     ('%s://username:pass@127.0.0.1' % proto, ['%s://' % proto, '127.0.0.1'],
      '%s://127.0.0.1' % proto),
     ('%s://127.0.0.1:8080' % proto, ['%s://' % proto, '127.0.0.1', '8080'],
      '%s://127.0.0.1:8080' % proto),
     ('%s://example.com' % proto, ['%s://' % proto, 'example.com'],
      '%s://example.com' % proto),
     ('%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
     @parametrize('test_url,expected,expected_creds', TEST_URLS)
     def test_credentials_filter(self, test_url, expected, expected_creds):
         from kallithea.lib.utils2 import credentials_filter
         assert credentials_filter(test_url) == expected_creds
     @parametrize('str_bool,expected', [

kallithea/tests/other/test_mail.py

➞

Show inline comments

@@ @@ -12,25 +12,25 @@ class smtplib_mock(object): @@
     def ehlo(self):
         pass
     def quit(self):
         pass
     def sendmail(self, sender, dest, msg):
         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'
         body = 'body'
         html_body = 'html_body'
         config_mock = {
             'smtp_server': mailserver,
             'app_email_from': envelope_from,

kallithea/tests/other/test_validators.py

➞

Show inline comments

@@ @@ -6,25 +6,25 @@ import tempfile @@
 from kallithea.tests import *
 from kallithea.model import validators as v
 from kallithea.model.user_group import UserGroupModel
 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()
         with pytest.raises(formencode.Invalid):
             validator.to_python('default')
         class StateObj(object):
             pass

0 comments (0 inline, 0 general)