kallithea Changeset - 3672a8e4584a

Changeset - 3672a8e4584a

Parent rev.

Child rev.

[Not reviewed]

default

1 2 0

Mads Kiilerich (mads) - 5 years ago 2020-12-14 17:56:31
mads@kiilerich.com

tests: drop vcs setup_package

Repos are always created before running vcs tests, and the SCMFetcher code was
thus effectively dead.

3 files changed with 0 insertions and 94 deletions:

kallithea/tests/fixture.py

kallithea/tests/vcs/__init__.py

kallithea/tests/vcs/utils.py

0 comments (0 inline, 0 general)

kallithea/tests/fixture.py

➞

Show inline comments

@@ @@ -34,25 +34,24 @@ from kallithea.model import db, meta @@
 from kallithea.model.changeset_status import ChangesetStatusModel
 from kallithea.model.comment import ChangesetCommentsModel
 from kallithea.model.gist import GistModel
 from kallithea.model.pull_request import CreatePullRequestAction  # , CreatePullRequestIterationAction, PullRequestModel
 from kallithea.model.repo import RepoModel
 from kallithea.model.repo_group import RepoGroupModel
 from kallithea.model.scm import ScmModel
 from kallithea.model.user import UserModel
 from kallithea.model.user_group import UserGroupModel
 from kallithea.tests.base import (GIT_REPO, HG_REPO, IP_ADDR, TEST_USER_ADMIN_EMAIL, TEST_USER_ADMIN_LOGIN, TEST_USER_ADMIN_PASS, TEST_USER_REGULAR2_EMAIL,
                                   TEST_USER_REGULAR2_LOGIN, TEST_USER_REGULAR2_PASS, TEST_USER_REGULAR_EMAIL, TEST_USER_REGULAR_LOGIN, TEST_USER_REGULAR_PASS,
                                   TESTS_TMP_PATH, invalidate_all_caches)
 from kallithea.tests.vcs import setup_package
 log = logging.getLogger(__name__)
 FIXTURES = os.path.join(dirname(dirname(os.path.abspath(__file__))), 'tests', 'fixtures')
 def raise_exception(*args, **kwargs):
     raise Exception('raise_exception raised exception')
 class Fixture(object):
@@ @@ -395,27 +394,24 @@ def create_test_env(repos_test_path, con @@
         log.debug('remove %s', data_path)
         shutil.rmtree(data_path)
     # CREATE DEFAULT TEST REPOS
     tar = tarfile.open(os.path.join(FIXTURES, 'vcs_test_hg.tar.gz'))
     tar.extractall(os.path.join(TESTS_TMP_PATH, HG_REPO))
     tar.close()
     tar = tarfile.open(os.path.join(FIXTURES, 'vcs_test_git.tar.gz'))
     tar.extractall(os.path.join(TESTS_TMP_PATH, GIT_REPO))
     tar.close()
     # LOAD VCS test stuff
     setup_package()
 def create_test_index(repo_location, config, full_index):
     """
     Makes default test index
     """
     index_location = os.path.join(config['index_dir'])
     if not os.path.exists(index_location):
         os.makedirs(index_location)
     l = DaemonLock(os.path.join(index_location, 'make_index.lock'))
     WhooshIndexingDaemon(index_location=index_location,

kallithea/tests/vcs/__init__.py

➞

Show inline comments

 """
 Unit tests for vcs_ library.
 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
 repository type and for example specific mercurial tests are located
 at ``test_hg`` module.
 """
 import os
 from kallithea.tests.base import GIT_REMOTE_REPO, HG_REMOTE_REPO, TEST_GIT_REPO, TEST_HG_REPO
 from kallithea.tests.vcs.utils import SCMFetcher
 # Base directory for the VCS tests.
 VCS_TEST_MODULE_BASE_DIR = os.path.abspath(os.path.dirname(__file__))
 # Path to user configuration file used during tests.
 TEST_USER_CONFIG_FILE = os.path.join(VCS_TEST_MODULE_BASE_DIR, 'aconfig')
 def setup_package():
     """
     Prepares whole package for tests which mainly means it would try to fetch
     test repositories or use already existing ones.
     """
     fetchers = {
         'hg': {
             'alias': 'hg',
             'test_repo_path': TEST_HG_REPO,
             'remote_repo': HG_REMOTE_REPO,
             'clone_cmd': 'hg clone --insecure',
         },
         'git': {
             'alias': 'git',
             'test_repo_path': TEST_GIT_REPO,
             'remote_repo': GIT_REMOTE_REPO,
             'clone_cmd': 'git clone --bare',
         },
+    }
     for scm, fetcher_info in fetchers.items():
         fetcher = SCMFetcher(**fetcher_info)
         fetcher.setup()

kallithea/tests/vcs/utils.py

➞

Show inline comments

deleted file

0 comments (0 inline, 0 general)