hans/Nominatim
1
0
Fork 1
mirror of https://github.com/osm-search/Nominatim.git synced 2026-03-11 05:14:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

change default nominatim path for tests to obvious '..'

Browse Source
This commit is contained in:
Sarah Hoffmann
2014-09-07 20:11:21 +02:00
parent 031f20c3e6
commit f94ee6ad57
3 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Makefile.am
View File

@@ -10,18 +10,18 @@ install:
@echo Nominatim needs to be executed directly from this directory. No install necessary. @echo Nominatim needs to be executed directly from this directory. No install necessary.
test: test:
cd tests; NOMINATIM_SERVER=${NOMINATIM_SERVER} NOMINATIM_DIR=.. lettuce -t -Fail -t -poldi-only cd tests; NOMINATIM_SERVER=${NOMINATIM_SERVER} lettuce -t -Fail -t -poldi-only
test-fast: test-fast:
cd tests; NOMINATIM_SERVER=${NOMINATIM_SERVER} NOMINATIM_REUSE_TEMPLATE=1 NOMINATIM_DIR=.. lettuce -t -Fail -t -poldi-only cd tests; NOMINATIM_SERVER=${NOMINATIM_SERVER} NOMINATIM_REUSE_TEMPLATE=1 lettuce -t -Fail -t -poldi-only
test-db: test-db:
cd tests; NOMINATIM_SERVER=${NOMINATIM_SERVER} NOMINATIM_DIR=.. lettuce -t -Fail -t -poldi-only -t DB cd tests; NOMINATIM_SERVER=${NOMINATIM_SERVER} lettuce -t -Fail -t -poldi-only -t DB
test-db-fast: test-db-fast:
cd tests; NOMINATIM_SERVER=${NOMINATIM_SERVER} NOMINATIM_REUSE_TEMPLATE=1 NOMINATIM_DIR=.. lettuce -t -Fail -t -poldi-only -t DB cd tests; NOMINATIM_SERVER=${NOMINATIM_SERVER} NOMINATIM_REUSE_TEMPLATE=1 lettuce -t -Fail -t -poldi-only -t DB
test-api: test-api:
cd tests; NOMINATIM_SERVER=${NOMINATIM_SERVER} NOMINATIM_DIR=.. lettuce -t -Fail -t -poldi-only features/api cd tests; NOMINATIM_SERVER=${NOMINATIM_SERVER} lettuce -t -Fail -t -poldi-only features/api
.PHONY: test test-fast test-db test-db-fast test-api .PHONY: test test-fast test-db test-db-fast test-api

4
tests/README.md
View File

@@ -40,6 +40,10 @@ The tests can be configured with a set of environment variables:
the next run. This speeds up tests considerably the next run. This speeds up tests considerably
but might lead to outdated errors for some but might lead to outdated errors for some
changes in the database layout. changes in the database layout.
* `NOMINATIM_KEEP_SCENARIO_DB` - if defined, the test database will not be
dropped after a test is finished. Should
only be used if one single scenario is run,
otherwise the result is undefined.
* `LOGLEVEL` - set to 'debug' to get more verbose output (only works properly * `LOGLEVEL` - set to 'debug' to get more verbose output (only works properly
when output to a logfile is configured) when output to a logfile is configured)
* `LOGFILE` - sends debug output to the given file * `LOGFILE` - sends debug output to the given file

2
tests/steps/terrain.py
View File

@@ -23,7 +23,7 @@ class NominatimConfig:
logging.basicConfig(level=loglevel) logging.basicConfig(level=loglevel)
# Nominatim test setup # Nominatim test setup
self.base_url = os.environ.get('NOMINATIM_SERVER', 'http://localhost/nominatim') self.base_url = os.environ.get('NOMINATIM_SERVER', 'http://localhost/nominatim')
self.source_dir = os.path.abspath(os.environ.get('NOMINATIM_DIR', '../Nominatim')) self.source_dir = os.path.abspath(os.environ.get('NOMINATIM_DIR', '..'))
self.template_db = os.environ.get('TEMPLATE_DB', 'test_template_nominatim') self.template_db = os.environ.get('TEMPLATE_DB', 'test_template_nominatim')
self.test_db = os.environ.get('TEST_DB', 'test_nominatim') self.test_db = os.environ.get('TEST_DB', 'test_nominatim')
self.local_settings_file = os.environ.get('NOMINATIM_SETTINGS', '/tmp/nominatim_settings.php') self.local_settings_file = os.environ.get('NOMINATIM_SETTINGS', '/tmp/nominatim_settings.php')