From b24ef60b33da99938d864b3ff1b9399282dd253a Mon Sep 17 00:00:00 2001 From: Sarah Hoffmann Date: Mon, 29 Feb 2016 23:45:30 +0100 Subject: [PATCH] enable test execution using ctest --- CMakeLists.txt | 23 +++++++++++++++++++++++ tests/steps/db_results.py | 1 - tests/steps/db_setup.py | 3 ++- tests/steps/osm2pgsql_setup.py | 6 ++++-- tests/steps/terrain.py | 10 ++++++---- 5 files changed, 35 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ceffb6fc..a561e020 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -32,6 +32,7 @@ add_definitions(-DNOMINATIM_VERSION="${NOMINATIM_VERSION}") # #----------------------------------------------------------------------------- +set(BUILD_TESTS on) add_subdirectory(osm2pgsql) find_package(Threads REQUIRED) @@ -73,6 +74,28 @@ execute_process( COMMAND ln -s -t ${PROJECT_BINARY_DIR} ${PROJECT_SOURCE_DIR}/utils ) +#----------------------------------------------------------------------------- +# +# Tests +# +#----------------------------------------------------------------------------- + +include(CTest) + +set(TEST_BDD db osm2pgsql api) + +foreach (test ${TEST_BDD}) + add_test(NAME bdd_${test} + COMMAND lettuce features/${test} + WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/tests) + set_tests_properties(bdd_${test} + PROPERTIES ENVIRONMENT "NOMINATIM_DIR=${PROJECT_BINARY_DIR}") +endforeach() + +add_test(NAME php + COMMAND phpunit ./ + WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/tests-php) + #----------------------------------------------------------------------------- add_subdirectory(module) diff --git a/tests/steps/db_results.py b/tests/steps/db_results.py index c3ac9445..71a30927 100644 --- a/tests/steps/db_results.py +++ b/tests/steps/db_results.py @@ -11,7 +11,6 @@ import psycopg2 import psycopg2.extensions import psycopg2.extras import os -import subprocess import random import json import re diff --git a/tests/steps/db_setup.py b/tests/steps/db_setup.py index e1315ed9..8041c6cc 100644 --- a/tests/steps/db_setup.py +++ b/tests/steps/db_setup.py @@ -266,7 +266,8 @@ def query_cmd(step, query, with_dups): '--search', query] if with_dups is not None: cmd.append('--nodedupe') - proc = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE) + proc = subprocess.Popen(cmd, cwd=world.config.source_dir, + stdout=subprocess.PIPE, stderr=subprocess.PIPE) (outp, err) = proc.communicate() assert (proc.returncode == 0), "query.php failed with message: %s" % err world.page = outp diff --git a/tests/steps/osm2pgsql_setup.py b/tests/steps/osm2pgsql_setup.py index eaa14573..4b03b1ea 100644 --- a/tests/steps/osm2pgsql_setup.py +++ b/tests/steps/osm2pgsql_setup.py @@ -155,7 +155,8 @@ def osm2pgsql_load_place(step): cmd = [os.path.join(world.config.source_dir, 'utils', 'setup.php')] cmd.extend(['--osm-file', fname, '--import-data','--osm2pgsql-cache', '300']) - proc = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE) + proc = subprocess.Popen(cmd, cwd=world.config.source_dir, + stdout=subprocess.PIPE, stderr=subprocess.PIPE) (outp, outerr) = proc.communicate() assert (proc.returncode == 0), "OSM data import failed:\n%s\n%s\n" % (outp, outerr) @@ -204,7 +205,8 @@ def osm2pgsql_update_place(step): cmd = [os.path.join(world.config.source_dir, 'utils', 'update.php')] cmd.extend(['--import-diff', fname]) - proc = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE) + proc = subprocess.Popen(cmd, cwd=world.config.source_dir, + stdout=subprocess.PIPE, stderr=subprocess.PIPE) (outp, outerr) = proc.communicate() assert (proc.returncode == 0), "OSM data update failed:\n%s\n%s\n" % (outp, outerr) diff --git a/tests/steps/terrain.py b/tests/steps/terrain.py index e9561d1a..349deafe 100644 --- a/tests/steps/terrain.py +++ b/tests/steps/terrain.py @@ -23,7 +23,7 @@ class NominatimConfig: logging.basicConfig(level=loglevel) # Nominatim test setup self.base_url = os.environ.get('NOMINATIM_SERVER', 'http://localhost/nominatim') - self.source_dir = os.path.abspath(os.environ.get('NOMINATIM_DIR', '..')) + self.source_dir = os.path.abspath(os.environ.get('NOMINATIM_DIR', '../build')) self.template_db = os.environ.get('TEMPLATE_DB', 'test_template_nominatim') self.test_db = os.environ.get('TEST_DB', 'test_nominatim') self.local_settings_file = os.environ.get('NOMINATIM_SETTINGS', '/tmp/nominatim_settings.php') @@ -52,7 +52,8 @@ def write_nominatim_config(dbname): def run_nominatim_script(script, *args): cmd = [os.path.join(world.config.source_dir, 'utils', '%s.php' % script)] cmd.extend(['--%s' % x for x in args]) - proc = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE) + proc = subprocess.Popen(cmd, cwd=world.config.source_dir, + stdout=subprocess.PIPE, stderr=subprocess.PIPE) (outp, outerr) = proc.communicate() assert (proc.returncode == 0), "Script '%s' failed:\n%s\n%s\n" % (script, outp, outerr) @@ -176,8 +177,9 @@ def db_template_setup(): conn.close() # execute osm2pgsql on an empty file to get the right tables osm2pgsql = os.path.join(world.config.source_dir, 'osm2pgsql', 'osm2pgsql') - proc = subprocess.Popen([osm2pgsql, '-lsc', '-O', 'gazetteer', '-d', world.config.template_db, '-'], - stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE) + proc = subprocess.Popen([osm2pgsql, '-lsc', '-r', 'xml', '-O', 'gazetteer', '-d', world.config.template_db, '-'], + cwd=world.config.source_dir, stdin=subprocess.PIPE, + stdout=subprocess.PIPE, stderr=subprocess.PIPE) [outstr, errstr] = proc.communicate(input='') world.run_nominatim_script('setup', 'create-functions', 'create-tables', 'create-partition-tables', 'create-partition-functions', 'load-data', 'create-search-indices') -- 2.39.5