adapt tests to new dotenv environment

DB tests now can simply set the environment to change configuration
variables. API tests still rely on a configuration file.

Also, query.php needs to set up the CONST_* variables to work with
the query scripts. That is a tiny bit messy and duplicates code
but this part will need to be reworked later.

diff --git a/lib/setup/SetupClass.php b/lib/setup/SetupClass.php
index 850ff297f73e8f382ea9e52c155dc83dd33a92ab..99cda584e5c68d589e62335cbecbffd046924008 100755 (executable)
--- a/lib/setup/SetupClass.php
+++ b/lib/setup/SetupClass.php
@@ -715,6 +715,8 @@ class SetupFunctions
         $rOutputFile = fopen(CONST_InstallDir.'/settings/settings-frontend.php', 'w');
 
         fwrite($rOutputFile, "<?php
         $rOutputFile = fopen(CONST_InstallDir.'/settings/settings-frontend.php', 'w');
 
         fwrite($rOutputFile, "<?php

+if (file_exists(getenv('NOMINATIM_SETTINGS'))) require_once(getenv('NOMINATIM_SETTINGS'));
+

 @define('CONST_Database_DSN', '".getSetting('DATABASE_DSN')."');
 @define('CONST_Default_Language', ".getSetting('DEFAULT_LANGUAGE', 'false').");
 @define('CONST_Log_DB', ".(getSettingBool('LOG_DB') ? 'true' : 'false').");
 @define('CONST_Database_DSN', '".getSetting('DATABASE_DSN')."');
 @define('CONST_Default_Language', ".getSetting('DEFAULT_LANGUAGE', 'false').");
 @define('CONST_Log_DB', ".(getSettingBool('LOG_DB') ? 'true' : 'false').");

diff --git a/test/bdd/environment.py b/test/bdd/environment.py
index ba18ef03644c308273746ecf89c6f1eafbd5b60e..ce556931fb1f6e817c0cfecd8e1de14de0be0f47 100644 (file)
--- a/test/bdd/environment.py
+++ b/test/bdd/environment.py
@@ -48,6 +48,7 @@ class NominatimEnvironment(object):
         self.keep_scenario_db = config['KEEP_TEST_DB']
         self.code_coverage_path = config['PHPCOV']
         self.code_coverage_id = 1
         self.keep_scenario_db = config['KEEP_TEST_DB']
         self.code_coverage_path = config['PHPCOV']
         self.code_coverage_id = 1

+        self.test_env = None

         os.environ['NOMINATIM_SETTINGS'] = self.local_settings_file
 
         self.template_db_done = False
         os.environ['NOMINATIM_SETTINGS'] = self.local_settings_file
 
         self.template_db_done = False


@@ -72,19 +73,17 @@ class NominatimEnvironment(object):
         return fn
 
     def write_nominatim_config(self, dbname):
         return fn
 
     def write_nominatim_config(self, dbname):

-        f = open(self.local_settings_file, 'w')
-        # https://secure.php.net/manual/en/ref.pdo-pgsql.connection.php
-        f.write("<?php\n  @define('CONST_Database_DSN', 'pgsql:dbname=%s%s%s%s%s');\n" %
-                (dbname,
+        self.test_env = os.environ
+        self.test_env['NOMINATIM_DATABASE_DSN'] = 'pgsql:dbname={}{}{}{}{}'.format(
+                dbname,

                  (';host=' + self.db_host) if self.db_host else '',
                  (';port=' + self.db_port) if self.db_port else '',
                  (';user=' + self.db_user) if self.db_user else '',
                  (';password=' + self.db_pass) if self.db_pass else ''
                  (';host=' + self.db_host) if self.db_host else '',
                  (';port=' + self.db_port) if self.db_port else '',
                  (';user=' + self.db_user) if self.db_user else '',
                  (';password=' + self.db_pass) if self.db_pass else ''

-                 ))
-        f.write("@define('CONST_Osm2pgsql_Flatnode_File', null);\n")
-        f.write("@define('CONST_Import_Style', CONST_DataDir.'/settings/import-full.style');\n")
-        f.write("@define('CONST_Use_US_Tiger_Data', true);\n")
-        f.close()
+                 )
+        self.test_env['NOMINATIM_FLATNODE_FILE'] = ''
+        self.test_env['NOMINATIM_IMPORT_STYLE'] = 'full'
+        self.test_env['NOMINATIM_USE_US_TIGER_DATA'] = 'yes'

 
     def cleanup(self):
         try:
 
     def cleanup(self):
         try:


@@ -152,7 +151,19 @@ class NominatimEnvironment(object):
 
 
     def setup_api_db(self, context):
 
 
     def setup_api_db(self, context):

-        self.write_nominatim_config(self.api_test_db)
+        f = open(self.local_settings_file, 'w')
+        # https://secure.php.net/manual/en/ref.pdo-pgsql.connection.php
+        f.write("<?php\n  @define('CONST_Database_DSN', 'pgsql:dbname=%s%s%s%s%s');\n" %
+                (self.api_test_db,
+                 (';host=' + self.db_host) if self.db_host else '',
+                 (';port=' + self.db_port) if self.db_port else '',
+                 (';user=' + self.db_user) if self.db_user else '',
+                 (';password=' + self.db_pass) if self.db_pass else ''
+                 ))
+        f.write("@define('CONST_Osm2pgsql_Flatnode_File', null);\n")
+        f.write("@define('CONST_Import_Style', CONST_DataDir.'/settings/import-full.style');\n")
+        f.write("@define('CONST_Use_US_Tiger_Data', true);\n")
+        f.close()

 
     def setup_unknown_db(self, context):
         self.write_nominatim_config('UNKNOWN_DATABASE_NAME')
 
     def setup_unknown_db(self, context):
         self.write_nominatim_config('UNKNOWN_DATABASE_NAME')


@@ -194,7 +205,7 @@ class NominatimEnvironment(object):
         cmd.extend(['--%s' % x for x in args])
         for k, v in kwargs.items():
             cmd.extend(('--' + k.replace('_', '-'), str(v)))
         cmd.extend(['--%s' % x for x in args])
         for k, v in kwargs.items():
             cmd.extend(('--' + k.replace('_', '-'), str(v)))

-        proc = subprocess.Popen(cmd, cwd=self.build_dir,
+        proc = subprocess.Popen(cmd, cwd=self.build_dir, env=self.test_env,

                                 stdout=subprocess.PIPE, stderr=subprocess.PIPE)
         (outp, outerr) = proc.communicate()
         outerr = outerr.decode('utf-8').replace('\\n', '\n')
                                 stdout=subprocess.PIPE, stderr=subprocess.PIPE)
         (outp, outerr) = proc.communicate()
         outerr = outerr.decode('utf-8').replace('\\n', '\n')

diff --git a/test/bdd/steps/queries.py b/test/bdd/steps/queries.py
index 65d5dccfcad4975a718cc9b27bf0e3344e40f04f..7e88e3371e4db6767500fbfafa696781753793d3 100644 (file)
--- a/test/bdd/steps/queries.py
+++ b/test/bdd/steps/queries.py
@@ -282,6 +282,7 @@ def query_cmd(context, query, dups):
     (outp, err) = proc.communicate()
 
     assert_equals (0, proc.returncode, "query.php failed with message: %s\noutput: %s" % (err, outp))
     (outp, err) = proc.communicate()
 
     assert_equals (0, proc.returncode, "query.php failed with message: %s\noutput: %s" % (err, outp))

+    logger.debug("run_nominatim_script: %s\n%s\n" % (cmd, outp.decode('utf-8').replace('\\n', '\n')))

 
     context.response = SearchResponse(outp.decode('utf-8'), 'json')
 
 
     context.response = SearchResponse(outp.decode('utf-8'), 'json')
 

diff --git a/utils/query.php b/utils/query.php
index 088c14ddd64ee21c216ec8a9b25b85693519a139..d002f898c83d9cf708e00cb8dccf638570fd8c4b 100644 (file)
--- a/utils/query.php
+++ b/utils/query.php
@@ -35,6 +35,21 @@ $aCMDOptions
 getCmdOpt($_SERVER['argv'], $aCMDOptions, $aCMDResult, true, true);
 
 loadSettings($aCMDResult['project-dir'] ?? getcwd());
 getCmdOpt($_SERVER['argv'], $aCMDOptions, $aCMDResult, true, true);
 
 loadSettings($aCMDResult['project-dir'] ?? getcwd());

+@define('CONST_Database_DSN', getSetting('DATABASE_DSN'));
+@define('CONST_Default_Language', getSetting('DEFAULT_LANGUAGE', false));
+@define('CONST_Log_DB', getSettingBool('LOG_DB'));
+@define('CONST_Log_File', getSetting('LOG_FILE', false));
+@define('CONST_Max_Word_Frequency', getSetting('MAX_WORD_FREQUENCY'));
+@define('CONST_NoAccessControl', getSettingBool('CORS_NOACCESSCONTROL'));
+@define('CONST_Places_Max_ID_count', getSetting('LOOKUP_MAX_COUNT'));
+@define('CONST_PolygonOutput_MaximumTypes', getSetting('POLYGON_OUTPUT_MAX_TYPES'));
+@define('CONST_Search_BatchMode', getSettingBool('SEARCH_BATCH_MODE'));
+@define('CONST_Search_NameOnlySearchFrequencyThreshold', getSetting('SEARCH_NAME_ONLY_THRESHOLD'));
+@define('CONST_Term_Normalization_Rules', getSetting('TERM_NORMALIZATION'));
+@define('CONST_Use_Aux_Location_data', getSettingBool('USE_AUX_LOCATION_DATA'));
+@define('CONST_Use_US_Tiger_Data', getSettingBool('USE_US_TIGER_DATA'));
+@define('CONST_MapIcon_URL', getSetting('MAPICON_URL', false));
+

 
 $oDB = new Nominatim\DB;
 $oDB->connect();
 
 $oDB = new Nominatim\DB;
 $oDB->connect();