kallithea Changeset - 45a281a0f36f

Changeset - 45a281a0f36f

Parent rev.

Child rev.

[Not reviewed]

default

0 14 0

Branko Majic (branko) - 8 years ago 2018-02-23 13:29:03
branko@majic.rs

Grafted from: b3354d6572cc

tests: Remove metaprogramming constructs for vcs test classes (issue #309):

- Removed use of the globals() and type() constructs to
programatically instantiate Git/Mercurial-specific test
classes. This should make it a bit clearer what tests are being run
at the expense of possible future VCS additions.
- Removed the SCM_TESTS VCS test configuration variable, since it got
removed. Previously it was used for instantiating test classes.
- Updated small snippet of inline documentation that described the use
of SCM_TESTS variable. New text points to inheriting from generic
test classes instead.
- base.py had a dead snippet - kill it.

14 files changed with 90 insertions and 107 deletions:

kallithea/tests/base.py

kallithea/tests/vcs/__init__.py

kallithea/tests/vcs/base.py

kallithea/tests/vcs/conf.py

kallithea/tests/vcs/test_archives.py

kallithea/tests/vcs/test_branches.py

kallithea/tests/vcs/test_changesets.py

kallithea/tests/vcs/test_filenodes_unicode_path.py

kallithea/tests/vcs/test_getitem.py

kallithea/tests/vcs/test_getslice.py

kallithea/tests/vcs/test_inmemchangesets.py

kallithea/tests/vcs/test_repository.py

kallithea/tests/vcs/test_tags.py

kallithea/tests/vcs/test_workdirs.py

0 comments (0 inline, 0 general)

kallithea/tests/base.py

➞

Show inline comments

@@ @@ -45,13 +45,13 @@ __all__ = [ @@
     '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', 'HG_TEST_REVISION', 'GIT_TEST_REVISION',
     'GIT_REMOTE_REPO', 'HG_TEST_REVISION', 'GIT_TEST_REVISION',
+]
 # Invoke websetup with the current config file
 # SetupCommand('setup-app').run([config_file])
 ## SOME GLOBALS FOR TESTS
@@ @@ -81,13 +81,12 @@ GIT_FORK = u'vcs_test_git_fork' @@
 HG_TEST_REVISION = u"a53d9201d4bc278910d416d94941b7ea007ecd52"
 GIT_TEST_REVISION = u"7ab37bc680b4aa72c34d07b230c866c28e9fc204"
 ## VCS
 SCM_TESTS = ['hg', 'git']
 uniq_suffix = str(int(time.mktime(datetime.datetime.now().timetuple())))
 GIT_REMOTE_REPO = os.path.join(TESTS_TMP_PATH, GIT_REPO)
 TEST_GIT_REPO = os.path.join(TESTS_TMP_PATH, GIT_REPO)
 TEST_GIT_REPO_CLONE = os.path.join(TESTS_TMP_PATH, 'vcs-git-clone-%s' % uniq_suffix)

kallithea/tests/vcs/__init__.py

➞

Show inline comments

 """
 Unit tests for vcs_ library.
 In order to run tests we need to prepare our environment first. Tests would be
 run for each engine listed at ``conf.SCM_TESTS`` - keys are aliases from
 ``vcs.backends.BACKENDS``.
 While some tests are implemented for a specific backend, a huge number
 is completely independent of the underlying backend.
 For such independent tests a base testing class is implemented, and
 backend-specific test classes are defined. These sub-classes simply
 need to set the correct backend to use by setting the
 ``backend_alias`` property, which should correspond to one of the keys
 from ``vcs.backends.BACKENDS``.
 For each SCM we run tests for, we need some repository. We would use
 repositories location provided in test suite defaults - see ``conf``
 module for more detail. We simply try to check if repository at
 certain location exists, if not we would try to fetch them. At
 ``test_vcs`` or ``test_common`` we run unit tests common for each

kallithea/tests/vcs/base.py

➞

Show inline comments

@@ @@ -6,13 +6,13 @@ import os @@
 import time
 import datetime
 from kallithea.lib import vcs
 from kallithea.lib.vcs.nodes import FileNode
-from kallithea.tests.vcs.conf import SCM_TESTS, get_new_dir
 from kallithea.tests.vcs.conf import get_new_dir
 class _BackendTestMixin(object):
     """
     This is a backend independent test case class which should be created
     with ``type`` method.
@@ @@ -80,15 +80,6 @@ class _BackendTestMixin(object): @@
                                      author=unicode(commit['author']),
                                      date=commit['date'])
     def setup_method(self, method):
         if getattr(self, 'recreate_repo_per_test', False):
             self.__class__.setup_class()
 # For each backend create test case class
 for alias in SCM_TESTS:
     attrs = {
         'backend_alias': alias,
+    }
     cls_name = ''.join(('%s base backend test' % alias).title().split())
     globals()[cls_name] = type(cls_name, (_BackendTestMixin,), attrs)

kallithea/tests/vcs/conf.py

➞

Show inline comments

@@ @@ -5,23 +5,22 @@ import os @@
 import uuid
 # Retrieve the necessary configuration options from the test base
 # module. Some of these configuration options are subsequently
 # consumed by the VCS test module.
 from kallithea.tests.base import (
-    TESTS_TMP_PATH, SCM_TESTS,
     TESTS_TMP_PATH,
     TEST_HG_REPO, HG_REMOTE_REPO,
     TEST_HG_REPO_CLONE, TEST_HG_REPO_PULL,
     TEST_GIT_REPO, GIT_REMOTE_REPO,
     TEST_GIT_REPO_CLONE,
+)
 __all__ = (
     'TEST_HG_REPO', 'TEST_GIT_REPO', 'HG_REMOTE_REPO', 'GIT_REMOTE_REPO',
     'TEST_HG_REPO_CLONE', 'TEST_GIT_REPO_CLONE', 'TEST_HG_REPO_PULL',
     'SCM_TESTS',
+)
 def get_new_dir(title=None):
     """
     Calculates a path for a new, non-existant, unique sub-directory in TESTS_TMP_PATH.

kallithea/tests/vcs/test_archives.py

➞

Show inline comments

@@ @@ -8,13 +8,13 @@ import StringIO @@
 import pytest
 from kallithea.lib.vcs.exceptions import VCSError
 from kallithea.lib.vcs.nodes import FileNode
 from kallithea.tests.vcs.base import _BackendTestMixin
-from kallithea.tests.vcs.conf import SCM_TESTS, TESTS_TMP_PATH
 from kallithea.tests.vcs.conf import TESTS_TMP_PATH
 class ArchivesTestCaseMixin(_BackendTestMixin):
     @classmethod
     def _get_commits(cls):
@@ @@ -94,13 +94,12 @@ class ArchivesTestCaseMixin(_BackendTest @@
     def test_archive_prefix_with_leading_slash(self):
         with pytest.raises(VCSError):
             self.tip.fill_archive(prefix='/any')
 # For each backend create test case class
 for alias in SCM_TESTS:
     attrs = {
         'backend_alias': alias,
+    }
     cls_name = ''.join(('test %s archive' % alias).title().split())
     globals()[cls_name] = type(cls_name, (ArchivesTestCaseMixin,), attrs)
 class TestGitArchive(ArchivesTestCaseMixin):
     backend_alias = 'git'
 class TestHgArchive(ArchivesTestCaseMixin):
     backend_alias = 'hg'

kallithea/tests/vcs/test_branches.py

➞

Show inline comments

 import datetime
 from kallithea.lib import vcs
 from kallithea.lib.vcs.nodes import FileNode
 from kallithea.tests.vcs.base import _BackendTestMixin
 from kallithea.tests.vcs.conf import SCM_TESTS
 class BranchesTestCaseMixin(_BackendTestMixin):
     @classmethod
     def _get_commits(cls):
@@ @@ -98,13 +97,12 @@ class BranchesTestCaseMixin(_BackendTest @@
         self.imc.commit(u'Branch without a slash...', author=u'joe',
             branch='123')
         assert 'issue/123' in self.repo.branches
         assert '123' in self.repo.branches
 # For each backend create test case class
 for alias in SCM_TESTS:
     attrs = {
         'backend_alias': alias,
+    }
     cls_name = ''.join(('test %s branches' % alias).title().split())
     globals()[cls_name] = type(cls_name, (BranchesTestCaseMixin,), attrs)
 class TestGitBranches(BranchesTestCaseMixin):
     backend_alias = 'git'
 class TestHgBranches(BranchesTestCaseMixin):
     backend_alias = 'hg'

kallithea/tests/vcs/test_changesets.py

➞

Show inline comments

@@ @@ -15,13 +15,13 @@ from kallithea.lib.vcs.nodes import ( @@
 from kallithea.lib.vcs.exceptions import (
     BranchDoesNotExistError, ChangesetDoesNotExistError,
     RepositoryError, EmptyRepositoryError
+)
 from kallithea.tests.vcs.base import _BackendTestMixin
-from kallithea.tests.vcs.conf import SCM_TESTS, get_new_dir
 from kallithea.tests.vcs.conf import get_new_dir
 class TestBaseChangeset(object):
     def test_as_dict(self):
         changeset = BaseChangeset()
@@ @@ -371,22 +371,28 @@ class _ChangesetsChangesTestCaseMixin(_B @@
     def test_get_filemode_non_ascii(self):
         changeset = self.repo.get_changeset()
         assert 33188 == changeset.get_file_mode('foo/bał')
         assert 33188 == changeset.get_file_mode(u'foo/bał')
 # For each backend create test case class
 for alias in SCM_TESTS:
     attrs = {
         'backend_alias': alias,
+    }
     # tests with additional commits
     cls_name = 'Test' + alias.title() + 'ChangesetsWithCommits'
     globals()[cls_name] = type(cls_name, (_ChangesetsWithCommitsTestCaseixin,), attrs)
 class TestGitChangesetsWithCommits(_ChangesetsWithCommitsTestCaseixin):
     backend_alias = 'git'
 class TestGitChangesets(_ChangesetsTestCaseMixin):
     backend_alias = 'git'
 class TestGitChangesetsChanges(_ChangesetsChangesTestCaseMixin):
     backend_alias = 'git'
     # tests without additional commits
     cls_name = 'Test' + alias.title() + 'Changesets'
     globals()[cls_name] = type(cls_name, (_ChangesetsTestCaseMixin,), attrs)
 class TestHgChangesetsWithCommits(_ChangesetsWithCommitsTestCaseixin):
     backend_alias = 'hg'
     # tests changes
     cls_name = 'Test' + alias.title() + 'ChangesetsChanges'
     globals()[cls_name] = type(cls_name, (_ChangesetsChangesTestCaseMixin,), attrs)
 class TestHgChangesets(_ChangesetsTestCaseMixin):
     backend_alias = 'hg'
 class TestHgChangesetsChanges(_ChangesetsChangesTestCaseMixin):
     backend_alias = 'hg'

kallithea/tests/vcs/test_filenodes_unicode_path.py

➞

Show inline comments

 # encoding: utf8
 import datetime
 from kallithea.lib.vcs.nodes import FileNode
 from kallithea.tests.vcs.test_inmemchangesets import BackendBaseTestCase
 from kallithea.tests.vcs.conf import SCM_TESTS
 class FileNodeUnicodePathTestsMixin(object):
     fname = 'ąśðąęłąć.txt'
     ufname = (fname).decode('utf-8')
@@ @@ -30,14 +29,12 @@ class FileNodeUnicodePathTestsMixin(obje @@
     def test_filenode_path(self):
         node = self.tip.get_node(self.fname)
         unode = self.tip.get_node(self.ufname)
         assert node == unode
 for alias in SCM_TESTS:
     attrs = {
         'backend_alias': alias,
+    }
     cls_name = ''.join(('test %s file node unicode path' % alias).title()
         .split())
     bases = (FileNodeUnicodePathTestsMixin, BackendBaseTestCase)
     globals()[cls_name] = type(cls_name, bases, attrs)
 class TestGitFileNodeUnicodePath(FileNodeUnicodePathTestsMixin, BackendBaseTestCase):
     backend_alias = 'git'
 class TestHgFileNodeUnicodePath(FileNodeUnicodePathTestsMixin, BackendBaseTestCase):
     backend_alias = 'hg'

kallithea/tests/vcs/test_getitem.py

➞

Show inline comments

 import datetime
 from kallithea.tests.vcs.base import _BackendTestMixin
 from kallithea.tests.vcs.conf import SCM_TESTS
 from kallithea.lib.vcs.nodes import FileNode
 class GetitemTestCaseMixin(_BackendTestMixin):
     @classmethod
@@ @@ -25,13 +24,12 @@ class GetitemTestCaseMixin(_BackendTestM @@
     def test__getitem__returns_correct_items(self):
         changesets = [self.repo[x] for x in xrange(len(self.repo.revisions))]
         assert changesets == list(self.repo.get_changesets())
 # For each backend create test case class
 for alias in SCM_TESTS:
     attrs = {
         'backend_alias': alias,
+    }
     cls_name = ''.join(('test %s getitem' % alias).title().split())
     globals()[cls_name] = type(cls_name, (GetitemTestCaseMixin,), attrs)
 class TestGitGetitem(GetitemTestCaseMixin):
     backend_alias = 'git'
 class TestHgGetitem(GetitemTestCaseMixin):
     backend_alias = 'hg'

kallithea/tests/vcs/test_getslice.py

➞

Show inline comments

 import datetime
 from kallithea.lib.vcs.nodes import FileNode
 from kallithea.tests.vcs.base import _BackendTestMixin
 from kallithea.tests.vcs.conf import SCM_TESTS
 class GetsliceTestCaseMixin(_BackendTestMixin):
     @classmethod
     def _get_commits(cls):
@@ @@ -34,13 +33,12 @@ class GetsliceTestCaseMixin(_BackendTest @@
         assert list(self.repo[:2]) == [self.repo.get_changeset(rev) for rev in self.repo.revisions[:2]]
     def test__getslice__respects_negative_end_index(self):
         assert list(self.repo[:-2]) == [self.repo.get_changeset(rev) for rev in self.repo.revisions[:-2]]
 # For each backend create test case class
 for alias in SCM_TESTS:
     attrs = {
         'backend_alias': alias,
+    }
     cls_name = ''.join(('test %s getslice' % alias).title().split())
     globals()[cls_name] = type(cls_name, (GetsliceTestCaseMixin,), attrs)
 class TestGitGetslice(GetsliceTestCaseMixin):
     backend_alias = 'git'
 class TestHgGetslice(GetsliceTestCaseMixin):
     backend_alias = 'hg'

kallithea/tests/vcs/test_inmemchangesets.py

➞

Show inline comments

@@ @@ -17,13 +17,13 @@ from kallithea.lib.vcs.exceptions import @@
 from kallithea.lib.vcs.exceptions import NodeDoesNotExistError
 from kallithea.lib.vcs.exceptions import NodeNotChangedError
 from kallithea.lib.vcs.nodes import DirNode
 from kallithea.lib.vcs.nodes import FileNode
 from kallithea.lib.vcs.utils import safe_unicode
-from kallithea.tests.vcs.conf import SCM_TESTS, get_new_dir
 from kallithea.tests.vcs.conf import get_new_dir
 class InMemoryChangesetTestMixin(object):
     """
     This is a backend independent test case class which should be created
     with ``type`` method.
@@ @@ -401,13 +401,12 @@ class BackendBaseTestCase(object): @@
                             author=unicode(commit['author']),
                 date=commit['date'])
         self.tip = self.repo.get_changeset()
 # For each backend create test case class
 for alias in SCM_TESTS:
     attrs = {
         'backend_alias': alias,
+    }
     cls_name = ''.join(('test %s in memory changeset' % alias).title().split())
     globals()[cls_name] = type(cls_name, (InMemoryChangesetTestMixin,), attrs)
 class TestGitInMemoryChangeset(InMemoryChangesetTestMixin):
     backend_alias = 'git'
 class TestHgInMemoryChangeset(InMemoryChangesetTestMixin):
     backend_alias = 'hg'

kallithea/tests/vcs/test_repository.py

➞

Show inline comments

@@ @@ -3,13 +3,12 @@ import datetime @@
 import pytest
 from kallithea.lib.vcs.nodes import FileNode
 from kallithea.lib.vcs.exceptions import ChangesetDoesNotExistError
 from kallithea.tests.vcs.base import _BackendTestMixin
 from kallithea.tests.vcs.conf import SCM_TESTS
 from kallithea.tests.vcs import TEST_USER_CONFIG_FILE
 class RepositoryBaseTest(_BackendTestMixin):
     recreate_repo_per_test = False
@@ @@ -41,12 +40,20 @@ class RepositoryBaseTest(_BackendTestMix @@
     def test_repo_equality_other_object(self):
         class dummy(object):
             path = self.repo.path
         assert self.repo != dummy()
 class TestGitRepositoryBase(RepositoryBaseTest):
     backend_alias = 'git'
 class TestHgRepositoryBase(RepositoryBaseTest):
     backend_alias = 'hg'
 class RepositoryGetDiffTest(_BackendTestMixin):
     @classmethod
     def _get_commits(cls):
         commits = [
+            {
@@ @@ -245,15 +252,6 @@ new file mode 100644 @@
 --- /dev/null
 +++ b/README{
@@ -0,0 +1,1 @@
 +Strangely-named README file
 \ No newline at end of file
 '''
 # For each backend create test case class
 for alias in SCM_TESTS:
     attrs = {
         'backend_alias': alias,
+    }
     cls_name = 'Test' + alias.capitalize() + RepositoryBaseTest.__name__
     globals()[cls_name] = type(cls_name, (RepositoryBaseTest,), attrs)

kallithea/tests/vcs/test_tags.py

➞

Show inline comments

 import pytest
 from kallithea.lib.vcs.exceptions import TagAlreadyExistError
 from kallithea.lib.vcs.exceptions import TagDoesNotExistError
 from kallithea.tests.vcs.base import _BackendTestMixin
 from kallithea.tests.vcs.conf import SCM_TESTS
 class TagsTestCaseMixin(_BackendTestMixin):
     def test_new_tag(self):
         tip = self.repo.get_changeset()
@@ @@ -43,13 +42,12 @@ class TagsTestCaseMixin(_BackendTestMixi @@
     def test_name_with_slash(self):
         self.repo.tag('19/10/11', 'joe')
         assert '19/10/11' in self.repo.tags
 # For each backend create test case class
 for alias in SCM_TESTS:
     attrs = {
         'backend_alias': alias,
+    }
     cls_name = ''.join(('test %s tags' % alias).title().split())
     globals()[cls_name] = type(cls_name, (TagsTestCaseMixin,), attrs)
 class TestGitTags(TagsTestCaseMixin):
     backend_alias = 'git'
 class TestHgTags(TagsTestCaseMixin):
     backend_alias = 'hg'

kallithea/tests/vcs/test_workdirs.py

➞

Show inline comments

@@ @@ -2,13 +2,12 @@ import datetime @@
 import pytest
 from kallithea.lib.vcs.nodes import FileNode
 from kallithea.tests.vcs.base import _BackendTestMixin
 from kallithea.tests.vcs.conf import SCM_TESTS
 class WorkdirTestCaseMixin(_BackendTestMixin):
     @classmethod
     def _get_commits(cls):
@@ @@ -81,13 +80,12 @@ class WorkdirTestCaseMixin(_BackendTestM @@
         assert self.repo.workdir.get_branch() == self.backend_class.DEFAULT_BRANCH_NAME
         # checkout 'foobranch'
         self.repo.workdir.checkout_branch('foobranch')
         assert self.repo.workdir.get_branch() == 'foobranch'
 # For each backend create test case class
 for alias in SCM_TESTS:
     attrs = {
         'backend_alias': alias,
+    }
     cls_name = ''.join(('test %s branch' % alias).title().split())
     globals()[cls_name] = type(cls_name, (WorkdirTestCaseMixin, ), attrs)
 class TestGitBranch(WorkdirTestCaseMixin):
     backend_alias = 'git'
 class TestHgBranch(WorkdirTestCaseMixin):
     backend_alias = 'hg'

0 comments (0 inline, 0 general)