Mercurial > kallithea
changeset 6038:9358211ee144
tests: move test data to top level 'data' folder - make grepping in kallithea/ easier
We like to have test.ini under kallithea/tests, but we don't want the temporary files there.
| author | Mads Kiilerich <madski@unity3d.com> |
|---|---|
| date | Thu, 28 Jul 2016 16:28:34 +0200 |
| parents | 7c732f2047f8 |
| children | b7ec26b3df1b |
| files | .hgignore kallithea/tests/test.ini scripts/generate-ini.py |
| diffstat | 3 files changed, 16 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgignore Thu Jul 28 16:28:34 2016 +0200 +++ b/.hgignore Thu Jul 28 16:28:34 2016 +0200 @@ -16,7 +16,6 @@ ^docs/build/ ^docs/_build/ ^data$ -^kallithea/tests/data$ ^sql_dumps/ ^\.settings$ ^\.project$ @@ -29,3 +28,4 @@ ^fabfile.py ^\.idea$ ^\.cache$ +/__pycache__$
--- a/kallithea/tests/test.ini Thu Jul 28 16:28:34 2016 +0200 +++ b/kallithea/tests/test.ini Thu Jul 28 16:28:34 2016 +0200 @@ -179,8 +179,10 @@ ## Available Languages: ## cs de fr hu ja nl_BE pl pt_BR ru sk zh_CN zh_TW lang = -cache_dir = %(here)s/data -index_dir = %(here)s/data/index +#cache_dir = %(here)s/data +cache_dir = %(here)s/../../data/test/cache +#index_dir = %(here)s/data/index +index_dir = %(here)s/../../data/test/index ## perform a full repository scan on each server start, this should be ## set to false after first startup, to allow faster server restarts. @@ -188,7 +190,8 @@ initial_repo_scan = true ## uncomment and set this path to use archive download cache -archive_cache_dir = %(here)s/tarballcache +#archive_cache_dir = %(here)s/tarballcache +archive_cache_dir = %(here)s/../../data/test/tarballcache ## change this to unique ID for security app_instance_uuid = test @@ -340,8 +343,10 @@ ### BEAKER CACHE #### #################################### -beaker.cache.data_dir = %(here)s/data/cache/data -beaker.cache.lock_dir = %(here)s/data/cache/lock +#beaker.cache.data_dir = %(here)s/data/cache/data +beaker.cache.data_dir = %(here)s/../../data/test/cache/data +#beaker.cache.lock_dir = %(here)s/data/cache/lock +beaker.cache.lock_dir = %(here)s/../../data/test/cache/lock beaker.cache.regions = short_term,long_term,sql_cache_short
--- a/scripts/generate-ini.py Thu Jul 28 16:28:34 2016 +0200 +++ b/scripts/generate-ini.py Thu Jul 28 16:28:34 2016 +0200 @@ -55,6 +55,11 @@ 'show_revision_number': 'true', 'beaker.cache.sql_cache_short.expire': '1', 'beaker.session.secret': '{74e0cd75-b339-478b-b129-07dd221def1f}', + 'cache_dir': '%(here)s/../../data/test/cache', + 'index_dir': '%(here)s/../../data/test/index', + 'archive_cache_dir': '%(here)s/../../data/test/tarballcache', + 'beaker.cache.data_dir': '%(here)s/../../data/test/cache/data', + 'beaker.cache.lock_dir': '%(here)s/../../data/test/cache/lock', 'sqlalchemy.db1.url': 'sqlite:///%(here)s/kallithea_test.sqlite', }, '[logger_root]': {