X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/925726222f76a3cc73263bd56ef593afaa83c865..e7b4fc70e786d6914ffad2bc424535b40c1db675:/test/bdd/steps/nominatim_environment.py?ds=sidebyside diff --git a/test/bdd/steps/nominatim_environment.py b/test/bdd/steps/nominatim_environment.py index 7eb6f3dd..1deb43f3 100644 --- a/test/bdd/steps/nominatim_environment.py +++ b/test/bdd/steps/nominatim_environment.py @@ -198,19 +198,15 @@ class NominatimEnvironment: try: self.run_nominatim('import', '--osm-file', str(self.api_test_file)) - if self.tokenizer != 'legacy_icu': - self.run_nominatim('add-data', '--tiger-data', str((testdata / 'tiger').resolve())) + self.run_nominatim('add-data', '--tiger-data', str((testdata / 'tiger').resolve())) self.run_nominatim('freeze') if self.tokenizer != 'legacy_icu': phrase_file = str((testdata / 'specialphrases_testdb.sql').resolve()) run_script(['psql', '-d', self.api_test_db, '-f', phrase_file]) else: - # XXX Temporary use the wiki while there is no CSV import - # available. - self.test_env['NOMINATIM_LANGUAGES'] = 'en' - self.run_nominatim('special-phrases', '--import-from-wiki') - del self.test_env['NOMINATIM_LANGUAGES'] + csv_path = str((testdata / 'full_en_phrases_test.csv').resolve()) + self.run_nominatim('special-phrases', '--import-from-csv', csv_path) except: self.db_drop_database(self.api_test_db) raise