kallithea Changeset - 6cc40e545e9a

Changeset - 6cc40e545e9a

Parent rev.

Child rev.

[Not reviewed]

default

0 3 0

Anton Schur - 9 years ago 2017-04-26 10:29:30
tonich.sh@gmail.com

test: move test environment initialization from the main code to tests

3 files changed with 24 insertions and 25 deletions:

kallithea/config/app_cfg.py

kallithea/tests/conftest.py

kallithea/tests/fixture.py

0 comments (0 inline, 0 general)

kallithea/config/app_cfg.py

➞

Show inline comments

@@ @@ -141,43 +141,24 @@ def setup_configuration(app): @@
                       'Expected database version id(s): %s\n'
                       'If you are a developer and you know what you are doing, you can add `ignore_alembic_revision = True` '
                       'to your .ini file to skip the check.\n' % (' '.join(current_heads), ' '.join(available_heads)))
             sys.exit(1)
     # store some globals into kallithea
     kallithea.CELERY_ON = str2bool(config['app_conf'].get('use_celery'))
     kallithea.CELERY_EAGER = str2bool(config['app_conf'].get('celery.always.eager'))
     kallithea.CONFIG = config
     load_rcextensions(root_path=config['here'])
     # FIXME move test setup code out of here
     test = os.path.split(config['__file__'])[-1] == 'test.ini'
     if test:
         test_env = not int(os.environ.get('KALLITHEA_NO_TMP_PATH', 0))
         test_index = not int(os.environ.get('KALLITHEA_WHOOSH_TEST_DISABLE', 0))
         if os.environ.get('TEST_DB'):
             # swap config if we pass environment variable
             config['sqlalchemy.url'] = os.environ.get('TEST_DB')
         from kallithea.tests.fixture import create_test_env, create_test_index
         from kallithea.tests.base import TESTS_TMP_PATH
         #set KALLITHEA_NO_TMP_PATH=1 to disable re-creating the database and
         #test repos
         if test_env:
             create_test_env(TESTS_TMP_PATH, config)
         #set KALLITHEA_WHOOSH_TEST_DISABLE=1 to disable whoosh index during tests
         if test_index:
             create_test_index(TESTS_TMP_PATH, config, True)
     set_available_permissions(config)
     repos_path = make_ui('db').configitems('paths')[0][1]
     config['base_path'] = repos_path
     set_app_settings(config)
     instance_id = kallithea.CONFIG.get('instance_id', '*')
     if instance_id == '*':
         instance_id = '%s-%s' % (platform.uname()[1], os.getpid())
         kallithea.CONFIG['instance_id'] = instance_id
     # update kallithea.CONFIG with the meanwhile changed 'config'
     kallithea.CONFIG.update(config)

kallithea/tests/conftest.py

➞

Show inline comments

 import os
 import sys
 import logging
 import pkg_resources
-from paste.deploy import loadapp
+from paste.deploy import loadwsgi
 from routes.util import URLGenerator
 from tg import config
 import pytest
 from kallithea.controllers.root import RootController
 from kallithea.model.user import UserModel
 from kallithea.model.meta import Session
 from kallithea.model.db import Setting, User, UserIpMap
 from kallithea.tests.base import invalidate_all_caches, TEST_USER_REGULAR_LOGIN
 import kallithea.tests.base # FIXME: needed for setting testapp instance!!!
 from tg.util.webtest import test_context
 def pytest_configure():
     path = os.getcwd()
     sys.path.insert(0, path)
     pkg_resources.working_set.add_entry(path)
     # Disable INFO logging of test database creation, restore with NOTSET
     logging.disable(logging.INFO)
     kallithea.tests.base.testapp = loadapp('config:kallithea/tests/test.ini', relative_to=path)
     context = loadwsgi.loadcontext(loadwsgi.APP, 'config:kallithea/tests/test.ini', relative_to=path)
     test_env = not int(os.environ.get('KALLITHEA_NO_TMP_PATH', 0))
     test_index = not int(os.environ.get('KALLITHEA_WHOOSH_TEST_DISABLE', 0))
     if os.environ.get('TEST_DB'):
         # swap config if we pass environment variable
         context.local_conf['sqlalchemy.url'] = os.environ.get('TEST_DB')
     from kallithea.tests.fixture import create_test_env, create_test_index
     from kallithea.tests.base import TESTS_TMP_PATH
     # set KALLITHEA_NO_TMP_PATH=1 to disable re-creating the database and
     # test repos
     if test_env:
         create_test_env(TESTS_TMP_PATH, context.config())
     # set KALLITHEA_WHOOSH_TEST_DISABLE=1 to disable whoosh index during tests
     if test_index:
         create_test_index(TESTS_TMP_PATH, context.config(), True)
     kallithea.tests.base.testapp = context.create()
     logging.disable(logging.NOTSET)
     kallithea.tests.base.url = URLGenerator(RootController().mapper, kallithea.tests.base.environ)
 @pytest.fixture
 def create_test_user():
     """Provide users that automatically disappear after test is over."""
     test_user_ids = []
     def _create_test_user(user_form):
         user = UserModel().create(user_form)
         test_user_ids.append(user.user_id)

kallithea/tests/fixture.py

➞

Show inline comments

@@ @@ -333,26 +333,26 @@ def create_test_env(repos_test_path, con @@
                         tests=True)
     dbmanage.create_tables(override=True)
     # for tests dynamically set new root paths based on generated content
     dbmanage.create_settings(dbmanage.config_prompt(repos_test_path))
     dbmanage.create_default_user()
     dbmanage.admin_prompt()
     dbmanage.create_permissions()
     dbmanage.populate_default_permissions()
     Session().commit()
     # PART TWO make test repo
     log.debug('making test vcs repositories')
     idx_path = config['app_conf']['index_dir']
     data_path = config['app_conf']['cache_dir']
     idx_path = config['index_dir']
     data_path = config['cache_dir']
     #clean index and data
     if idx_path and os.path.exists(idx_path):
         log.debug('remove %s', idx_path)
         shutil.rmtree(idx_path)
     if data_path and os.path.exists(data_path):
         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'))
@@ @@ -367,24 +367,24 @@ def create_test_env(repos_test_path, con @@
     from kallithea.tests.vcs import setup_package
     setup_package()
 def create_test_index(repo_location, config, full_index):
     """
     Makes default test index
     """
     from kallithea.lib.indexers.daemon import WhooshIndexingDaemon
     from kallithea.lib.pidlock import DaemonLock, LockHeld
-    index_location = os.path.join(config['app_conf']['index_dir'])
     index_location = os.path.join(config['index_dir'])
     if not os.path.exists(index_location):
         os.makedirs(index_location)
     try:
         l = DaemonLock(file_=os.path.join(dirname(index_location), 'make_index.lock'))
         WhooshIndexingDaemon(index_location=index_location,
                              repo_location=repo_location) \
             .run(full_index=full_index)
         l.release()
     except LockHeld:
         pass

0 comments (0 inline, 0 general)